From db1a13db0ded8dff49fe98e5d9659305b8789725 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 11:42:42 +0100 Subject: [PATCH] Fixed some issues --- src/main/java/com/bbn/hadder/Hadder.java | 3 ++- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- .../bbn/hadder/listener/MentionListener.java | 2 +- .../listener/PrivateMessageListener.java | 11 +++-------- .../com/bbn/hadder/listener/ReadyListener.java | 18 ++++++++++++++++++ 5 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/listener/ReadyListener.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index ffc15da..4dc5db3 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -51,7 +51,8 @@ public class Hadder { new PrivateMessageListener(), new CommandListener(), new GuildJoinListener(), - new GuildLeaveListener()); + new GuildLeaveListener(), + new ReadyListener()); try { ShardManager shardManager = builder.build(); diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index ac28f7f..eab7240 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -18,10 +18,10 @@ public class Rethink { public static boolean connect() { try { conn = r.connection().hostname("127.0.0.1").db("Hadder").port(28015).connect(); - System.out.println("CONNECTED"); + System.out.println("DB CONNECTED"); } catch (Exception e) { System.out.println(e.toString()); - System.out.println("CONNECTION FAILED"); + System.out.println("DB CONNECTION FAILED"); } return true; } diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 3bdca7e..cdb3e88 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -13,7 +13,7 @@ public class MentionListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().equals("<@!" + event.getJDA().getSelfUser().getId() + ">")) { + if (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())) { EmbedBuilder builder = new EmbedBuilder() .setTitle("Hello I'm Hadder.") .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index b2c6b48..2486190 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -22,15 +22,10 @@ public class PrivateMessageListener extends ListenerAdapter { 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()); + 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(); - } 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(); - } + Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue(); + Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java new file mode 100644 index 0000000..3c39a44 --- /dev/null +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -0,0 +1,18 @@ +package com.bbn.hadder.listener; + +import com.bbn.hadder.Rethink; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.events.ReadyEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; + +import javax.annotation.Nonnull; + +public class ReadyListener extends ListenerAdapter { + + @Override + public void onReady(@Nonnull ReadyEvent event) { + for (Guild g : event.getJDA().getGuilds()) { + Rethink.insertServer(g.getId()); + } + } +}