Merge pull request #5 from BigBotNetwork/hax-dev

Hax dev

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();

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;
     }

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())

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());
-
-                    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();
-                }
+                Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue();
             }
         }
     }

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());
+        }
+    }
+}