From 1f11bd5189cad7146e735a2596076f5947cb1f34 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 25 Oct 2019 11:17:33 +0200 Subject: [PATCH 1/5] Streaming Status --- src/main/java/com/bbn/hadder/Hadder.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index ff98425..9bdeddc 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -1,5 +1,6 @@ package com.bbn.hadder; +import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; import org.json.JSONObject; @@ -30,6 +31,7 @@ public class Hadder { DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder(); builder.setShardsTotal(1); + builder.setActivity(Activity.streaming("auf dem BigBotNetwork", "https://twitch.tv/BigBotNetwork")); builder.setToken(config.getString("Token")); try { -- 2.45.3 From 8cf0219d98c53d1ea6eef17b8a6a241d9804ff14 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 25 Oct 2019 11:44:16 +0200 Subject: [PATCH 2/5] brr scurr --- src/main/java/com/bbn/hadder/Hadder.java | 3 ++ .../java/com/bbn/hadder/MessageEditor.java | 32 ++++++++++++++++++ .../bbn/hadder/listener/MentionListener.java | 23 +++++++++++++ target/classes/META-INF/Hadder.kotlin_module | Bin 0 -> 16 bytes 4 files changed, 58 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/MessageEditor.java create mode 100644 src/main/java/com/bbn/hadder/listener/MentionListener.java create mode 100644 target/classes/META-INF/Hadder.kotlin_module diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index ff98425..26480dd 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -1,5 +1,6 @@ package com.bbn.hadder; +import com.bbn.hadder.listener.MentionListener; import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; import org.json.JSONObject; @@ -32,6 +33,8 @@ public class Hadder { builder.setShardsTotal(1); builder.setToken(config.getString("Token")); + builder.addEventListeners(new MentionListener()); + try { ShardManager shardManager = builder.build(); } catch (LoginException e) { diff --git a/src/main/java/com/bbn/hadder/MessageEditor.java b/src/main/java/com/bbn/hadder/MessageEditor.java new file mode 100644 index 0000000..8958f3c --- /dev/null +++ b/src/main/java/com/bbn/hadder/MessageEditor.java @@ -0,0 +1,32 @@ +package com.bbn.hadder; + +import net.dv8tion.jda.api.EmbedBuilder; + +import java.awt.*; + +public class MessageEditor { + + public EmbedBuilder setDefaultSettings(Messagetype type, EmbedBuilder embedBuilder) { + switch (type) { + case INFO: + embedBuilder.setColor(new Color(47,94,105)); + break; + + case ERROR: + embedBuilder.setColor(Color.RED); + break; + + case WARNING: + embedBuilder.setColor(Color.ORANGE); + break; + } + return embedBuilder; + } + + public enum Messagetype { + ERROR, + WARNING, + INFO + } + +} diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java new file mode 100644 index 0000000..2f80548 --- /dev/null +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -0,0 +1,23 @@ +package com.bbn.hadder.listener; + +import com.bbn.hadder.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; + +import javax.annotation.Nonnull; + +public class MentionListener extends ListenerAdapter { + + @Override + public void onMessageReceived(@Nonnull MessageReceivedEvent event) { + if (event.getMessage().getContentRaw().equals(event.getJDA().getSelfUser().getAsMention())) { + 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/target/classes/META-INF/Hadder.kotlin_module b/target/classes/META-INF/Hadder.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..2983af70661ad375cc499ebc4da5a68ca46c532e GIT binary patch literal 16 RcmZQzU|?ooU|@t|egFVe02KfL literal 0 HcmV?d00001 -- 2.45.3 From 18d9b8ccfc60f62c934bf2d4457e0e93b18bf9d8 Mon Sep 17 00:00:00 2001 From: Greg TK <33130539+GregTCLTK@users.noreply.github.com> Date: Fri, 25 Oct 2019 12:01:33 +0200 Subject: [PATCH 3/5] Create FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..17bd127 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +custom: https://donatebot.io/checkout/448554629282922527 -- 2.45.3 From 1ebf140bf971f5e4ba70278ca38d895624791ccc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 25 Oct 2019 18:22:10 +0200 Subject: [PATCH 4/5] Fixing bug --- src/main/java/com/bbn/hadder/listener/MentionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 2f80548..2d57506 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -11,7 +11,7 @@ public class MentionListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (event.getMessage().getContentRaw().equals(event.getJDA().getSelfUser().getAsMention())) { + 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()) -- 2.45.3 From 95a553b4ea31313e54c7074f8257687002b121bf Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 26 Oct 2019 12:16:42 +0200 Subject: [PATCH 5/5] Adding SelfMentionListener --- pom.xml | 8 ++++ src/main/java/com/bbn/hadder/Hadder.java | 10 ++--- .../bbn/hadder/listener/MentionListener.java | 19 ++++++---- .../listener/PrivateMessageListener.java | 37 +++++++++++++++++++ .../bbn/hadder/{ => utils}/MessageEditor.java | 2 +- 5 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java rename src/main/java/com/bbn/hadder/{ => utils}/MessageEditor.java (95%) 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; -- 2.45.3