diff --git a/pom.xml b/pom.xml
index b256bcb..ae4c80a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,14 @@
13
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 12
+ 12
+
+
\ No newline at end of file
diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 71b7ea8..9ff2dd9 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -1,6 +1,6 @@
package com.bbn.hadder;
-import com.bbn.hadder.listener.MentionListener;
+import com.bbn.hadder.listener.*;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
import net.dv8tion.jda.api.sharding.ShardManager;
@@ -16,15 +16,15 @@ public class Hadder {
public static void main(String[] args) {
- File jsonfile = new File("./config.json");
- if (!jsonfile.exists()) {
+ File configfile = new File("./config.json");
+ if (!configfile.exists()) {
System.err.println("No Config File Found!");
System.exit(1);
}
JSONObject config = null;
try {
- config = new JSONObject(new String(Files.readAllBytes(Paths.get(jsonfile.toURI()))));
+ config = new JSONObject(new String(Files.readAllBytes(Paths.get(configfile.toURI()))));
} catch (IOException e) {
e.printStackTrace();
}
@@ -35,7 +35,7 @@ public class Hadder {
builder.setActivity(Activity.streaming("auf dem BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
builder.setToken(config.getString("Token"));
- builder.addEventListeners(new MentionListener());
+ builder.addEventListeners(new MentionListener(), new PrivateMessageListener());
try {
ShardManager shardManager = builder.build();
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index 2d57506..0fc8a6c 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -1,7 +1,8 @@
package com.bbn.hadder.listener;
-import com.bbn.hadder.MessageEditor;
+import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -11,13 +12,15 @@ public class MentionListener extends ListenerAdapter {
@Override
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
- if (event.getMessage().getMentionedMembers().contains(event.getGuild().getSelfMember())) {
- EmbedBuilder builder = new EmbedBuilder()
- .setTitle("Hello I'm Hadder.")
- .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
- .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
- .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false);
- event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).build()).queue();
+ if (event.isFromType(ChannelType.TEXT)) {
+ if (event.getMessage().getMentionedMembers().contains(event.getGuild().getSelfMember())) {
+ EmbedBuilder builder = new EmbedBuilder()
+ .setTitle("Hello I'm Hadder.")
+ .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
+ .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
+ .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false);
+ event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).build()).queue();
+ }
}
}
}
diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
new file mode 100644
index 0000000..b2c6b48
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
@@ -0,0 +1,37 @@
+package com.bbn.hadder.listener;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.PrivateChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+import java.time.Instant;
+
+public class PrivateMessageListener extends ListenerAdapter {
+
+ public void onMessageReceived(MessageReceivedEvent event) {
+ if (event.isFromType(ChannelType.PRIVATE)) {
+ if (!event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
+
+ PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
+ PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
+
+ if (event.getAuthor().getAvatarUrl() == null) {
+ EmbedBuilder message = new EmbedBuilder().setTitle("New DM by " + event.getAuthor().getAsTag()).setAuthor(event.getAuthor().getName(), event.getAuthor().getDefaultAvatarUrl(), event.getAuthor().getDefaultAvatarUrl()).setDescription(event.getMessage().getContentRaw()).setTimestamp(Instant.now());
+
+ Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue();
+ } else {
+ EmbedBuilder message = new EmbedBuilder().setTitle("New DM by " + event.getAuthor().getAsTag()).setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()).setDescription(event.getMessage().getContentRaw()).setTimestamp(Instant.now());
+
+ Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue();
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/bbn/hadder/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
similarity index 95%
rename from src/main/java/com/bbn/hadder/MessageEditor.java
rename to src/main/java/com/bbn/hadder/utils/MessageEditor.java
index 8958f3c..1cab926 100644
--- a/src/main/java/com/bbn/hadder/MessageEditor.java
+++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
@@ -1,4 +1,4 @@
-package com.bbn.hadder;
+package com.bbn.hadder.utils;
import net.dv8tion.jda.api.EmbedBuilder;