From e96354eed8879f07256c21d21a6feee35753e3f1 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 18:23:13 +0100 Subject: [PATCH 1/3] eyyy --- .../bbn/hadder/listener/GuildJoinListener.java | 16 ---------------- .../bbn/hadder/listener/GuildLeaveListener.java | 16 ---------------- .../{BotListListener.java => GuildListener.java} | 0 3 files changed, 32 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/listener/GuildJoinListener.java delete mode 100644 src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java rename src/main/java/com/bbn/hadder/listener/{BotListListener.java => GuildListener.java} (100%) diff --git a/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java b/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java deleted file mode 100644 index cdea693..0000000 --- a/src/main/java/com/bbn/hadder/listener/GuildJoinListener.java +++ /dev/null @@ -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()); - } -} diff --git a/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java b/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java deleted file mode 100644 index fc65d2e..0000000 --- a/src/main/java/com/bbn/hadder/listener/GuildLeaveListener.java +++ /dev/null @@ -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) { - - - } -} diff --git a/src/main/java/com/bbn/hadder/listener/BotListListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java similarity index 100% rename from src/main/java/com/bbn/hadder/listener/BotListListener.java rename to src/main/java/com/bbn/hadder/listener/GuildListener.java From 93937bc9535649ce7692a84ccbcd28fc50c4ee54 Mon Sep 17 00:00:00 2001 From: Hax Date: Sun, 27 Oct 2019 18:34:30 +0100 Subject: [PATCH 2/3] Jojojo ey --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 12 ++++++++++++ .../java/com/bbn/hadder/listener/GuildListener.java | 13 +++++++++---- .../java/com/bbn/hadder/listener/ReadyListener.java | 6 ++++++ 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index bde7d09..fad99a7 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -56,7 +56,7 @@ public class Hadder { new CommandListener(), new GuildJoinListener(), new GuildLeaveListener(), - new BotListListener(), + new GuildListener(), new ReadyListener()); try { diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 7853082..68fa912 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/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); diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 2d57cbc..7da1d4f 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -4,20 +4,25 @@ 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 BotListListener extends 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()); + } } } diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 3072f77..4d24a2b 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/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()); } From 7ea6c4d9b4ba3c4ff0f367fff5ba4e08a404df4b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 27 Oct 2019 22:05:25 +0100 Subject: [PATCH 3/3] Update Hadder.java --- src/main/java/com/bbn/hadder/Hadder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index bde7d09..157d555 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -38,8 +38,7 @@ public class Hadder { e.printStackTrace(); } - Rethink.connect(); - + Rethink.connect(); DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder();