From 06c3abc28365b0f070aed6994b9f641542971b0e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 22 Feb 2020 21:12:06 +0100 Subject: [PATCH 01/16] Fix --- src/main/java/com/bbn/hadder/core/Config.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index b8fc4cf..fc5fff7 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -76,10 +76,10 @@ public class Config { .key("DiscordBestBots").value(null) .key("DiscordBoats").value(null) .key("YetAnotherBotList").value(null) - .value("DiscordExtremeList").value(null) - .value("DiscordBotReviews").value(null) - .value("DiscordBots").value(null) - .value("BotListSpace").value(null) + .key("DiscordExtremeList").value(null) + .key("DiscordBotReviews").value(null) + .key("DiscordBots").value(null) + .key("BotListSpace").value(null) .endObject().endObject().toString(); } From 8f642f44a954478148c4ad276a9b26812d2a9528 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 22 Feb 2020 21:14:08 +0100 Subject: [PATCH 02/16] Not needed --- src/main/java/com/bbn/hadder/core/Config.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index fc5fff7..8eda9f6 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -142,11 +142,7 @@ public class Config { public String getDiscordExtremeListToken() { return config.getJSONObject("Tokens").getString("DiscordExtremeList"); } - - public String getDiscordBotReviewsToken() { - return config.getJSONObject("Tokens").getString("DiscordBotReviews"); - } - + public String getDiscordBotsToken() { return config.getJSONObject("Tokens").getString("DiscordBots"); } From 7519b7724f5101d145b184188e7a24e81a3206a7 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 22 Feb 2020 21:24:20 +0100 Subject: [PATCH 03/16] update invite perms --- .../java/com/bbn/hadder/commands/general/InviteCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 6127fce..7338876 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -33,7 +33,7 @@ public class InviteCommand implements Command { "commands.general.invite.success.description", "(https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() - + "&scope=bot&permissions=470133879)") + + "&scope=bot&permissions=1043852663)") .build()).queue(); } From 85611bf0693c927ba81958ad5bca1ca7a59eecc0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 22 Feb 2020 21:24:24 +0100 Subject: [PATCH 04/16] idk --- src/main/java/com/bbn/hadder/core/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 8eda9f6..63ef2f9 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -142,7 +142,7 @@ public class Config { public String getDiscordExtremeListToken() { return config.getJSONObject("Tokens").getString("DiscordExtremeList"); } - + public String getDiscordBotsToken() { return config.getJSONObject("Tokens").getString("DiscordBots"); } From 586ce7b15131e1765274a47abce792525b917a50 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 22 Feb 2020 21:25:11 +0100 Subject: [PATCH 05/16] Uhm --- .../java/com/bbn/hadder/commands/general/InviteCommand.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 7338876..68e3f68 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -16,7 +16,6 @@ package com.bbn.hadder.commands.general; -import com.bbn.hadder.Hadder; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; @@ -32,7 +31,7 @@ public class InviteCommand implements Command { "", "commands.general.invite.success.description", "(https://discordapp.com/oauth2/authorize?client_id=" - + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + + e.getJDA().getSelfUser().getId() + "&scope=bot&permissions=1043852663)") .build()).queue(); } From d0d75bfaf7ad7f46a7ed8e72b168eb956ad4318e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 23 Feb 2020 19:40:10 +0000 Subject: [PATCH 06/16] Bump github-api from 1.106 to 1.107 Bumps github-api from 1.106 to 1.107. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42ab70c..97fd525 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.kohsuke github-api - 1.106 + 1.107 com.sedmelluq From 3d010c42cf70024b7cd70716a8cbf2a36479efe9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 23 Feb 2020 20:47:45 +0100 Subject: [PATCH 07/16] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97fd525..a56b160 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.1.0 + 1.1.1 Hadder From ca0f0f5693852656d33c7a680dcc4db15a3f9ba3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 23 Feb 2020 20:53:06 +0100 Subject: [PATCH 08/16] Update a lot of config stuff --- src/main/java/com/bbn/hadder/core/Config.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 63ef2f9..2af7ff2 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -70,17 +70,22 @@ public class Config { .key("Tokens").object() .key("BotToken").value(null) .key("Giphy").value(null) + .key("GitHub").value(null) .key("MythicalBotList").value(null) .key("BotsForDiscord").value(null) .key("DiscordBotList").value(null) - .key("DiscordBestBots").value(null) .key("DiscordBoats").value(null) .key("YetAnotherBotList").value(null) .key("DiscordExtremeList").value(null) .key("DiscordBotReviews").value(null) .key("DiscordBots").value(null) .key("BotListSpace").value(null) - .endObject().endObject().toString(); + .key("DiscordBots2").value(null) + .key("CloudList").value(null) + .key("Arcane").value(null) + .endObject() + .key("Clyde").value("Clyde") + .endObject().toString(); } public String getBotToken() { @@ -159,6 +164,10 @@ public class Config { return config.getJSONObject("Tokens").getString("CloudList"); } + public String getArcaneToken() { + return config.getJSONObject("Tokens").getString("Arcane"); + } + public String getClydeName() { return config.getString("Clyde"); } From 431ecf8a673fcb90a796458b4adab041478c4878 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 23 Feb 2020 20:55:46 +0100 Subject: [PATCH 09/16] Add a new bot list --- src/main/java/com/bbn/hadder/utils/BotList.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index cf5890b..3abfe8d 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -40,6 +40,7 @@ public class BotList { private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639"; private static String DiscordBots2 = "https://discord.bots.gg/api/v1/bots/637002314162372639/stats"; private static String CloudList = "https://www.cloudlist.xyz/api/stats/637002314162372639"; + private static String ArcaneBotCenter = "https://arcane-botcenter.xyz/api/637002314162372639/stats"; private Config config; @@ -57,6 +58,7 @@ public class BotList { json.put("users", Hadder.shardManager.getUsers().size()); json.put("shard_count", Hadder.shardManager.getShards().size()); json.put("shardCount", Hadder.shardManager.getShards().size()); + json.put("member_count", Hadder.shardManager.getUsers().size()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString()); @@ -209,6 +211,21 @@ public class BotList { } catch (IOException e) { e.printStackTrace(); } + + // Arcane Bot Center + + Request arcane = new Request.Builder() + .url(ArcaneBotCenter) + .post(body) + .addHeader("Authorization", config.getArcaneToken()) + .build(); + + try { + new OkHttpClient().newCall(arcane).execute().close(); + System.out.println("Successfully posted count to the Arcane Bot Center!"); + } catch (IOException e) { + e.printStackTrace(); + } } } } From 6963935348b842484eac6969b556d3f69bbc7e36 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 23 Feb 2020 21:09:27 +0100 Subject: [PATCH 10/16] Add pom description --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a56b160..fd93186 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,8 @@ Hadder Hadder 1.1.1 - Hadder + Hadder is a multi-purpose Discord bot. UTF-8 From 56712881556d56622bfb7c9a8a6412f5526ea151 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 23 Feb 2020 21:12:43 +0100 Subject: [PATCH 11/16] Add license and inception to pom --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index fd93186..d8d1693 100644 --- a/pom.xml +++ b/pom.xml @@ -7,8 +7,17 @@ Hadder 1.1.1 Hadder + 2019 Hadder is a multi-purpose Discord bot. + + + GNU Affero General Public License v3.0 + https://www.gnu.org/licenses/agpl-3.0.en.html + repo + + + UTF-8 1.13 From a6fe1d419f0e871a44d0ed6399a8710f490836da Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 23 Feb 2020 21:51:04 +0100 Subject: [PATCH 12/16] url yk --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d8d1693..3602715 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ Hadder 2019 Hadder is a multi-purpose Discord bot. + https://github.com/BigBotNetwork/Hadder From 3d47b3a0149faee06a7cb82bcf629b89d95eb7c1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:33:28 +0000 Subject: [PATCH 13/16] Bump JDA from 4.1.1_108 to 4.1.1_109 Bumps JDA from 4.1.1_108 to 4.1.1_109. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3602715..62fcb5b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_108 + 4.1.1_109 org.json From 25355681638f329af7b3bfa84c35964bae5c3ce3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 26 Feb 2020 17:05:13 +0100 Subject: [PATCH 14/16] Prevent error yk --- .../java/com/bbn/hadder/commands/moderation/RulesCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 48d54d2..756c327 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -56,7 +56,7 @@ public class RulesCommand implements Command { try { TextChannel channel = e1.getGuild().getTextChannelsByName(e1.getMessage().getContentRaw(), true).get(0); createRules(e, e1, channel); - } catch (NullPointerException ex) { + } catch (NullPointerException | IndexOutOfBoundsException ex) { e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, From 6c23b8c9bb34d14c2a191055f7c2d0d1de1dd026 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 13:21:18 +0000 Subject: [PATCH 15/16] Bump JDA from 4.1.1_109 to 4.1.1_110 Bumps JDA from 4.1.1_109 to 4.1.1_110. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62fcb5b..2c19aa3 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_109 + 4.1.1_110 org.json From 72cbcc18f7202e1de6697d88535258a4fde81ece Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 13:33:07 +0000 Subject: [PATCH 16/16] Bump jackson-annotations from 2.10.2 to 2.10.3 Bumps [jackson-annotations](https://github.com/FasterXML/jackson) from 2.10.2 to 2.10.3. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c19aa3..0e927f3 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.2 + 2.10.3