Merge branch 'greg-dev' of https://github.com/BigBotNetwork/Hadder into greg-dev

src/main/java/com/bbn/hadder/Hadder.java

@@ -54,7 +54,7 @@ public class Hadder {
                 new CommandListener(),
                 new GuildJoinListener(),
                 new GuildLeaveListener(),
-                new BotListListener(),
+                new GuildListener(),
                 new ReadyListener());
 
         try {

src/main/java/com/bbn/hadder/Rethink.java

@@ -72,6 +72,18 @@ public class Rethink {
         return out;
     }
 
+    public static String insertUser(String id) {
+        String out = "";
+        try {
+            Cursor cursor = r.table("user")
+                    .insert(r.hashMap("id", id)
+                            .with("prefix", "h.")
+                    ).run(conn);
+            out = cursor.next().toString();
+        } catch (ClassCastException ignored) {}
+        return out;
+    }
+
     public static void setup() {
         try {
             r.dbCreate("Hadder").run(conn);

src/main/java/com/bbn/hadder/listener/BotListListener.java

@@ -1,23 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
-import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-public class BotListListener extends ListenerAdapter {
-
-    public void onGuildJoin(GuildJoinEvent event) {
-
-
-    }
-
-    public void onGuildLeave(GuildLeaveEvent event) {
-
-
-
-    }
-}

src/main/java/com/bbn/hadder/listener/GuildJoinListener.java

@@ -1,16 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Rethink;
-import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-
-public class GuildJoinListener extends ListenerAdapter {
-    public void onGuildJoin(@NotNull GuildJoinEvent event) {
-        Rethink.insertServer(event.getGuild().getId());
-    }
-}

src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java

@@ -1,16 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-
-public class GuildLeaveListener extends ListenerAdapter {
-    public void onGuildLeave(@NotNull GuildLeaveEvent event) {
-
-
-    }
-}

src/main/java/com/bbn/hadder/listener/GuildListener.java

@@ -0,0 +1,28 @@
+package com.bbn.hadder.listener;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.Rethink;
+import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
+import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
+import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+public class GuildListener extends ListenerAdapter {
+
+    public void onGuildJoin(GuildJoinEvent event) {
+        Rethink.insertServer(event.getGuild().getId());
+    }
+
+    public void onGuildLeave(GuildLeaveEvent event) {
+
+    }
+
+    public void onGuildMemberJoin(GuildMemberJoinEvent event) {
+        if (!event.getUser().getId().equals(event.getJDA().getSelfUser().getId())) {
+            Rethink.insertUser(event.getUser().getId());
+        }
+    }
+}

src/main/java/com/bbn/hadder/listener/ReadyListener.java

@@ -2,6 +2,7 @@ package com.bbn.hadder.listener;
 
 import com.bbn.hadder.Rethink;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
@@ -12,6 +13,11 @@ public class ReadyListener extends ListenerAdapter {
     @Override
     public void onReady(@Nonnull ReadyEvent event) {
         Rethink.setup();
+        for (User user : event.getJDA().getUsers()) {
+            if (!user.getId().equals(event.getJDA().getSelfUser().getId())) {
+                Rethink.insertUser(user.getId());
+            }
+        }
         for (Guild g : event.getJDA().getGuilds()) {
             Rethink.insertServer(g.getId());
         }