From c96792f7c9dd517e6fcad6f62e05218d79bc185f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 01:30:49 +0100 Subject: [PATCH 1/9] Public ShardManager --- src/main/java/com/bbn/hadder/Hadder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 1da65ee..6ec4194 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -24,6 +24,8 @@ import java.util.List; public class Hadder { + public static ShardManager shardManager; + public static void main(String[] args) { startBot(); } @@ -61,7 +63,7 @@ public class Hadder { new ReadyListener()); try { - ShardManager shardManager = builder.build(); + shardManager = builder.build(); } catch (LoginException e) { e.printStackTrace(); } From ace8587f96ba1ab6405051277d6d31c4915cef54 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 01:31:32 +0100 Subject: [PATCH 2/9] First Bot List Integration --- .../bbn/hadder/listener/GuildListener.java | 5 ++ .../bbn/hadder/listener/ReadyListener.java | 3 + .../java/com/bbn/hadder/utils/BotList.java | 55 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/utils/BotList.java diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 2ac0825..f37bd2c 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -5,6 +5,7 @@ package com.bbn.hadder.listener; */ import com.bbn.hadder.Rethink; +import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; @@ -34,6 +35,8 @@ public class GuildListener extends ListenerAdapter { .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); + + BotList.post(); } public void onGuildLeave(GuildLeaveEvent event) { @@ -46,6 +49,8 @@ public class GuildListener extends ListenerAdapter { .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); + + BotList.post(); } public void onGuildMemberJoin(GuildMemberJoinEvent event) { diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 4d24a2b..a007c31 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -1,6 +1,7 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; +import com.bbn.hadder.utils.BotList; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.ReadyEvent; @@ -21,5 +22,7 @@ public class ReadyListener extends ListenerAdapter { for (Guild g : event.getJDA().getGuilds()) { Rethink.insertServer(g.getId()); } + + BotList.post(); } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java new file mode 100644 index 0000000..b4ac8ed --- /dev/null +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -0,0 +1,55 @@ +package com.bbn.hadder.utils; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.Hadder; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +public class BotList { + + private static String MythicalBotList = "https://mythicalbots.xyz/api"; + + private static JSONObject json = new JSONObject(); + + public static void post() { + json.put("server_count", Hadder.shardManager.getGuilds().size()); + + RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString()); + + File configfile = new File("./config.json"); + + JSONObject config = null; + try { + config = new JSONObject(new String(Files.readAllBytes(Paths.get(configfile.toURI())))); + } catch (IOException e) { + e.printStackTrace(); + } + + // Mythical Bot List + Request mythicalbotlist = new Request.Builder() + .url(MythicalBotList) + .post(body) + .addHeader("Authorization", config.getString("MythicalBotList")) + .build(); + + try { + new OkHttpClient().newCall(mythicalbotlist).execute().close(); + System.out.println("Successfully posted count for the Mythical Bot List!"); + } catch (IOException e) { + e.printStackTrace(); + } + + } + +} From ed6f53dda02bd8565f14d8cd09e32819f88393da Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 01:31:32 +0100 Subject: [PATCH 3/9] First Bot List Integration --- .../bbn/hadder/listener/GuildListener.java | 5 ++ .../bbn/hadder/listener/ReadyListener.java | 3 + .../java/com/bbn/hadder/utils/BotList.java | 55 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/utils/BotList.java diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 2ac0825..f37bd2c 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -5,6 +5,7 @@ package com.bbn.hadder.listener; */ import com.bbn.hadder.Rethink; +import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; @@ -34,6 +35,8 @@ public class GuildListener extends ListenerAdapter { .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); + + BotList.post(); } public void onGuildLeave(GuildLeaveEvent event) { @@ -46,6 +49,8 @@ public class GuildListener extends ListenerAdapter { .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); + + BotList.post(); } public void onGuildMemberJoin(GuildMemberJoinEvent event) { diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 4d24a2b..a007c31 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -1,6 +1,7 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; +import com.bbn.hadder.utils.BotList; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.ReadyEvent; @@ -21,5 +22,7 @@ public class ReadyListener extends ListenerAdapter { for (Guild g : event.getJDA().getGuilds()) { Rethink.insertServer(g.getId()); } + + BotList.post(); } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java new file mode 100644 index 0000000..b4ac8ed --- /dev/null +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -0,0 +1,55 @@ +package com.bbn.hadder.utils; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.Hadder; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +public class BotList { + + private static String MythicalBotList = "https://mythicalbots.xyz/api"; + + private static JSONObject json = new JSONObject(); + + public static void post() { + json.put("server_count", Hadder.shardManager.getGuilds().size()); + + RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString()); + + File configfile = new File("./config.json"); + + JSONObject config = null; + try { + config = new JSONObject(new String(Files.readAllBytes(Paths.get(configfile.toURI())))); + } catch (IOException e) { + e.printStackTrace(); + } + + // Mythical Bot List + Request mythicalbotlist = new Request.Builder() + .url(MythicalBotList) + .post(body) + .addHeader("Authorization", config.getString("MythicalBotList")) + .build(); + + try { + new OkHttpClient().newCall(mythicalbotlist).execute().close(); + System.out.println("Successfully posted count for the Mythical Bot List!"); + } catch (IOException e) { + e.printStackTrace(); + } + + } + +} From da9a2af4adba1b66cb8d4229f7ea766ffdca8324 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 01:39:09 +0100 Subject: [PATCH 4/9] OOOPPPPSSSS --- src/main/java/com/bbn/hadder/utils/BotList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index b4ac8ed..3ae0424 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -18,7 +18,7 @@ import java.nio.file.Paths; public class BotList { - private static String MythicalBotList = "https://mythicalbots.xyz/api"; + private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639"; private static JSONObject json = new JSONObject(); From 5570021b969385d7f0355a31cd0e2e458ec024e2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 01:43:19 +0100 Subject: [PATCH 5/9] Test --- src/main/java/com/bbn/hadder/utils/BotList.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 3ae0424..94e6771 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -37,6 +37,7 @@ public class BotList { } // Mythical Bot List + Request mythicalbotlist = new Request.Builder() .url(MythicalBotList) .post(body) From 10658cf8bc1ea0caec80636da5eb039a7d81f24c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 11:57:29 +0100 Subject: [PATCH 6/9] Two more Bot Lists :) --- .../java/com/bbn/hadder/utils/BotList.java | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 94e6771..c8e53ee 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -19,11 +19,15 @@ import java.nio.file.Paths; public class BotList { private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639"; + private static String BotsForDiscord = "https://botsfordiscord.com/api/bot/637002314162372639"; + private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats"; private static JSONObject json = new JSONObject(); public static void post() { json.put("server_count", Hadder.shardManager.getGuilds().size()); + json.put("guilds", Hadder.shardManager.getGuilds().size()); + json.put("users", Hadder.shardManager.getUsers().size()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString()); @@ -37,7 +41,7 @@ public class BotList { } // Mythical Bot List - + Request mythicalbotlist = new Request.Builder() .url(MythicalBotList) .post(body) @@ -51,6 +55,35 @@ public class BotList { e.printStackTrace(); } + // BotsForDiscord + + Request botsfordiscord = new Request.Builder() + .url(BotsForDiscord) + .post(body) + .addHeader("Authorization", config.getString("BotsForDiscord")) + .build(); + + try { + new OkHttpClient().newCall(botsfordiscord).execute().close(); + System.out.println("Successfully posted count to Bots For Discord!"); + } catch (IOException e) { + e.printStackTrace(); + } + + // Discord Bot List + + Request discordbotlist = new Request.Builder() + .url(DiscordBotList) + .post(body) + .addHeader("Authorization", "Bot " + config.getString("DiscordBotList")) + .build(); + + try { + new OkHttpClient().newCall(discordbotlist).execute().close(); + System.out.println("Successfully posted count for the Discord Bot List"); + } catch (IOException e) { + e.printStackTrace(); + } } } From 41fced853eec272e7cb4dc8e7126728d8e053a7b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 3 Nov 2019 12:03:19 +0100 Subject: [PATCH 7/9] Added Discord Best Bots --- src/main/java/com/bbn/hadder/utils/BotList.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index c8e53ee..fbee5ca 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -21,6 +21,7 @@ public class BotList { private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639"; private static String BotsForDiscord = "https://botsfordiscord.com/api/bot/637002314162372639"; private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats"; + private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats"; private static JSONObject json = new JSONObject(); @@ -84,6 +85,21 @@ public class BotList { } catch (IOException e) { e.printStackTrace(); } + + // Discord Best Bots + + Request discordbestbots = new Request.Builder() + .url(DiscordBestBots) + .post(body) + .addHeader("Authorization", config.getString("DiscordBestBots")) + .build(); + + try { + new OkHttpClient().newCall(discordbestbots).execute().close(); + System.out.println("Successfully posted count to Discord Best Bots!"); + } catch (IOException e) { + e.printStackTrace(); + } } } From 02d69428e098978541efc3ee8082fc26dd94bfdf Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 3 Nov 2019 16:22:52 +0100 Subject: [PATCH 8/9] Create CODEOWNERS --- .github/CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..dcfa72f --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +* @GregTCLTK +* @Schlauer-Hax From 97e1a80fffce460d804e8e1e460ba728a96b6246 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 3 Nov 2019 16:26:01 +0100 Subject: [PATCH 9/9] Update CODEOWNERS --- .github/CODEOWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index dcfa72f..7f10e1b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1 @@ -* @GregTCLTK -* @Schlauer-Hax +* @GregTCLTK @Schlauer-Hax