From 4e6842bcd352fd72822d361601f0a4f10082a932 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:26:53 +0100 Subject: [PATCH 01/87] Revert "v1.1.2" --- pom.xml | 4 ++-- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8cb9b8d..0e927f3 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.1.1 + 2.4.0 org.slf4j @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.108 + 1.107 com.sedmelluq diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index d1e3c3f..aeaaf58 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn).toString(); + String response = r.table(table).get(id).toJson().run(conn); return new JSONObject(response); } From 841821abe3af7e450073d88a77fc4a7e114518c6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:31:05 +0100 Subject: [PATCH 02/87] Revert "Revert "v1.1.2"" --- pom.xml | 4 ++-- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0e927f3..8cb9b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.1.1 org.slf4j @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.107 + 1.108 com.sedmelluq diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index aeaaf58..d1e3c3f 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn); + String response = r.table(table).get(id).toJson().run(conn).toString(); return new JSONObject(response); } From 3a56c0da11c7c09cfe298871374618e1b12a4353 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 13:17:38 +0000 Subject: [PATCH 03/87] Bump rethinkdb-driver from 2.4.0 to 2.4.1.1 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.0 to 2.4.1.1. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/v2.4.0...v2.4.1.1) 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 c77db22..45289ec 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.1.1 org.slf4j From e031eb1532217a8b406d59988f415fabbddb05a8 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Mar 2020 15:28:16 +0100 Subject: [PATCH 04/87] Fix help stuff --- .../hadder/commands/misc/MoveAllCommand.java | 27 ++++++++++++------- .../Translations/Translations_en.properties | 1 + 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java index bf8fc95..d6e84f7 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -1,5 +1,17 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder.commands.misc; @@ -9,10 +21,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.Member; -import java.util.ArrayList; import java.util.Objects; public class MoveAllCommand implements Command { @@ -29,24 +38,22 @@ public class MoveAllCommand implements Command { ); e.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully Moved!").setDescription("I moved " + count + " Members. Have fun!").build()).queue(); - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override public String[] labels() { - return new String[]{"moveall", "move-all"}; + return new String[]{"moveall", "move-all", "ma"}; } @Override public String description() { - return "Moves All users in channel1 to channel2"; + return "commands.misc.moveall.help.description"; } @Override public String usage() { - return "[channel1] [channel2]"; + return "[source-channel] [target-channel]"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 01d2f6e..0ccc653 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -98,6 +98,7 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From 8de3748f1a8864f2c2c29c977f97a41b3c642d98 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Mar 2020 15:35:27 +0100 Subject: [PATCH 05/87] i18n stuff --- .../hadder/commands/misc/MoveAllCommand.java | 20 +++++++++---------- .../Translations/Translations_en.properties | 2 ++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java index d6e84f7..8746c3c 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -20,24 +20,22 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; -import net.dv8tion.jda.api.EmbedBuilder; - -import java.util.Objects; +import com.bbn.hadder.utils.MessageEditor; +@Perms(Perm.VOICE_MOVE_OTHERS) public class MoveAllCommand implements Command { - @Perms(Perm.VOICE_MOVE_OTHERS) @Override public void executed(String[] args, CommandEvent e) { if (args.length == 2) { - int count = Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().size(); - Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().forEach( - member -> { - e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue(); - } + int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); + e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( + member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() ); - e.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully Moved!").setDescription("I moved " + - count + " Members. Have fun!").build()).queue(); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.misc.moveall.success.title", "", + "commands.misc.moveall.success.description", String.valueOf(count)) + .build()).queue(); } else e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 0ccc653..e818bc3 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -98,6 +98,8 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun! commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. commands.moderation.ban.success.title = Successfully banned From 39cef6b5fdcda09f57ebd6c4ea5e6ab87eff62c8 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Mar 2020 15:51:48 +0100 Subject: [PATCH 06/87] Remove a line lol --- src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java index 8746c3c..519e681 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -15,7 +15,6 @@ */ package com.bbn.hadder.commands.misc; - import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; From b4a25bfc97c573d7cd2b89e4ae1013a81d0bb7e7 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Mar 2020 15:53:09 +0100 Subject: [PATCH 07/87] covid command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/misc/CoronaCommand.java | 48 +++++++++++++++++++ .../Translations/Translations_en.properties | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 0d93dd7..99f9b3d 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -127,7 +127,8 @@ public class Hadder { new ServerStatsCommand(), new ProfileCommand(), new CodeCommand(), - new MoveAllCommand()), config, helpCommand); + new MoveAllCommand(), + new CoronaCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java new file mode 100644 index 0000000..3235fa3 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java @@ -0,0 +1,48 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.bbn.hadder.commands.misc; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; + +public class CoronaCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent e) { + + } + + @Override + public String[] labels() { + return new String[]{"corona"}; + } + + @Override + public String description() { + return "commands.misc.corona.help.description"; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } +} diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index e818bc3..f967f19 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -101,6 +101,7 @@ commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun! commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From 36994799bd2aa04670bf47bf536385227c308c06 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Mar 2020 16:19:13 +0100 Subject: [PATCH 08/87] Finish it --- .../hadder/commands/misc/CoronaCommand.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java index 3235fa3..4f47da5 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java @@ -18,12 +18,33 @@ package com.bbn.hadder.commands.misc; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.json.JSONObject; + +import java.io.IOException; public class CoronaCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { + OkHttpClient client = new OkHttpClient(); + Request request = new Request.Builder().url("https://api.covid.stream/latest/numbers").build(); + try { + Response response = client.newCall(request).execute(); + JSONObject json = new JSONObject(response.body().string()).getJSONObject("data"); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("`Confirmed cases:` **").append(json.get("totalConfirmedNumber")).append("**\n").append("`Deaths:` **").append(json.get("totalDeathNumbers")).append("** \n").append("`Recovered:`" ).append("** \n"); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setDescription(stringBuilder).build()).queue(); + } catch (IOException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR) + .setTitle("API Error") + .setDescription("Try again later!") + .build()).queue(); + } } @Override From b8cf0cfe054442233fbedbfb87c478a0c4dc3e80 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Mar 2020 16:22:06 +0100 Subject: [PATCH 09/87] Fix --- src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java index 4f47da5..3f24ea5 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java @@ -37,7 +37,7 @@ public class CoronaCommand implements Command { Response response = client.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()).getJSONObject("data"); StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("`Confirmed cases:` **").append(json.get("totalConfirmedNumber")).append("**\n").append("`Deaths:` **").append(json.get("totalDeathNumbers")).append("** \n").append("`Recovered:`" ).append("** \n"); + stringBuilder.append("`Confirmed cases:` **").append(json.get("totalConfirmedNumbers")).append("**\n").append("`Deaths:` **").append(json.get("totalDeathNumbers")).append("** \n").append("`Recovered:` **").append(json.get("totalRecoveredNumbers")).append("** \n"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setDescription(stringBuilder).build()).queue(); } catch (IOException ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR) From 43679a7b386b8ee28807ab62b33135daa15559d1 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:35 +0100 Subject: [PATCH 10/87] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index bda82bd..8d5f954 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = Diese Nachricht enthält einige Informa commands.misc.code.error.title = Code nicht gefunden commands.misc.code.error.description = Ich kann den angegebenen Einladungscode nicht finden. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Erfolgreich gebannt commands.moderation.ban.success.description = Ich habe %extra% erfolgreich gebannt From fdcb948a61eb7fb2b6705428dd8670581c3d8425 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:36 +0100 Subject: [PATCH 11/87] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 01d2f6e..1f07242 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From 7068178610f27057e9365cabe7a8463958c44c68 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:38 +0100 Subject: [PATCH 12/87] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 01d2f6e..1f07242 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From 8f660ce36a43617d3ee5b8adec1fb8e22080bac1 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:39 +0100 Subject: [PATCH 13/87] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 01d2f6e..1f07242 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From a43e5fb2a518c1c7fb14de20e504e7701313f8d7 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:41 +0100 Subject: [PATCH 14/87] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 01d2f6e..1f07242 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From 14509bd92f32f7b118c69d0d4f51ef885d287b33 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:42 +0100 Subject: [PATCH 15/87] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 01d2f6e..1f07242 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From d9c5710b6fd2d55cde53c4dce99ed1f8d1d16689 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 14 Mar 2020 21:41:44 +0100 Subject: [PATCH 16/87] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 01d2f6e..1f07242 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -98,6 +98,10 @@ commands.misc.code.success.description = This message contains some information commands.misc.code.error.title = Code not found commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% From cc5b2946d7f172e25432a6e8dade2cf8ec1abcc2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 13:20:03 +0000 Subject: [PATCH 17/87] Bump JDA from 4.1.1_113 to 4.1.1_116 Bumps JDA from 4.1.1_113 to 4.1.1_116. 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 8fc48d9..62f6bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_113 + 4.1.1_116 org.json From bdf23106180546ec4540e79165a2cc3479362292 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 13:18:23 +0000 Subject: [PATCH 18/87] Bump JDA from 4.1.1_116 to 4.1.1_121 Bumps JDA from 4.1.1_116 to 4.1.1_121. 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 62f6bd5..8dfe5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_116 + 4.1.1_121 org.json From 1438fba6ba35e2e71f498975e0d8620ef821d14d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 18 Mar 2020 18:38:59 +0100 Subject: [PATCH 19/87] Remove deprecated function --- src/main/java/com/bbn/hadder/Hadder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 99f9b3d..4afe7ca 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -51,15 +51,14 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder(); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.createDefault(config.getBotToken()); builder.setAutoReconnect(true); builder.setShardsTotal(1); - builder.setChunkingFilter(ChunkingFilter.ALL); + builder.setChunkingFilter(ChunkingFilter.NONE); builder.setBulkDeleteSplittingEnabled(true); builder.setActivity(Activity.listening("to h.help")); builder.setStatus(OnlineStatus.DO_NOT_DISTURB); - builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); AudioManager audioManager = new AudioManager(); From e77dd007a0ca394201c36f454ae8829715eee745 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 13:17:53 +0000 Subject: [PATCH 20/87] Bump JDA from 4.1.1_121 to 4.1.1_122 Bumps JDA from 4.1.1_121 to 4.1.1_122. 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 7df9612..e9cd4b9 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_121 + 4.1.1_122 org.json From e74d46418407306dc8f19e4d8c6b5fd35541ef88 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 20 Mar 2020 19:16:54 +0100 Subject: [PATCH 21/87] Downgrade again :( --- pom.xml | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7df9612..8dfe5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.1.1 + 2.4.0 org.slf4j diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index aeaaf58..6be8bdd 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -72,8 +72,8 @@ public class Rethink { else return null; } - public Object getByID(String table, String wherevalue, String column) { - return r.table(table).get(wherevalue).getField(column).run(conn); + public Object getByID(String table, String where, String column) { + return r.table(table).get(where).getField(column).run(conn); } public JSONObject getObjectByID(String table, String id) { From 8bde70bdec3943ec1289a159c787f29b4c72088b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 20 Mar 2020 19:22:08 +0100 Subject: [PATCH 22/87] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98c98df..5870d56 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.1.3 + 1.3.1 Hadder 2019 Hadder is a multi-purpose Discord bot. From fe7efa6b84212efb54ee3efef1506eb7f49a5c42 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 21 Mar 2020 17:39:50 +0100 Subject: [PATCH 23/87] New error messages --- .../hadder/commands/misc/MoveAllCommand.java | 29 ++++++++++++++----- .../Translations/Translations_en.properties | 4 +++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java index 519e681..b8d1dc6 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -20,6 +20,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import com.bbn.hadder.utils.MessageEditor; +import org.apache.commons.lang3.StringUtils; @Perms(Perm.VOICE_MOVE_OTHERS) public class MoveAllCommand implements Command { @@ -27,14 +28,26 @@ public class MoveAllCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length == 2) { - int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); - e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( - member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() - ); - e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.misc.moveall.success.title", "", - "commands.misc.moveall.success.description", String.valueOf(count)) - .build()).queue(); + if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) { + if (StringUtils.isNumeric(args[1]) && args[1].length() == 18) { + int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); + e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( + member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() + ); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.misc.moveall.success.title", "", + "commands.misc.moveall.success.description", String.valueOf(count)) + .build()).queue(); + } else { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.misc.moveall.error.target.int.title", + "commands.misc.moveall.error.target.int.description").build()).queue(); + } + } else { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.misc.moveall.error.source.int.title", + "commands.misc.moveall.error.source.int.description").build()).queue(); + } } else e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -100,6 +100,10 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.error.source.int.title = Invalid ID +commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. +commands.misc.moveall.error.target.int.title = Invalid ID +commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. commands.misc.corona.help.description = Show the newest stats about COVID-19 From 0770e1dc634bba77033bb1e3eb9846478873fae4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 13:22:21 +0000 Subject: [PATCH 24/87] Bump lavaplayer from 1.3.34 to 1.3.36 Bumps lavaplayer from 1.3.34 to 1.3.36. 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 5870d56..285d770 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.34 + 1.3.36 com.fasterxml.jackson.core From 3de190b620945f03e740debdc5d12f96142aea6c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 13:17:46 +0000 Subject: [PATCH 25/87] Bump JDA from 4.1.1_122 to 4.1.1_124 Bumps JDA from 4.1.1_122 to 4.1.1_124. 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 285d770..a9dc3b0 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_122 + 4.1.1_124 org.json From 7a0f4ef4dd6f52120077270ca004a7905db5ad32 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 13:18:07 +0000 Subject: [PATCH 26/87] Bump lavaplayer from 1.3.36 to 1.3.38 Bumps lavaplayer from 1.3.36 to 1.3.38. 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 285d770..178486d 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.36 + 1.3.38 com.fasterxml.jackson.core From 8ba4a1ed219b16b3ca843b47daedd9bf8f10cda7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 13:18:31 +0000 Subject: [PATCH 27/87] Bump discord-webhooks from 0.2.0 to 0.3.0 Bumps discord-webhooks from 0.2.0 to 0.3.0. 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 285d770..7ff9400 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ club.minnced discord-webhooks - 0.2.0 + 0.3.0 org.kohsuke From 7d8566c67d8114a73dab38f34d4186a6b30c6b8f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 24 Mar 2020 14:27:51 +0100 Subject: [PATCH 28/87] Version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c59ac6..5e4ffc4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.3.1 + 1.3.2 Hadder 2019 Hadder is a multi-purpose Discord bot. From 745c48c74a718fc383b49c44c5782cadd84e1433 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 13:17:14 +0000 Subject: [PATCH 29/87] Bump JDA from 4.1.1_124 to 4.1.1_125 Bumps JDA from 4.1.1_124 to 4.1.1_125. 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 5e4ffc4..ae03d75 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_124 + 4.1.1_125 org.json From 85a0b10860bb0bb79fc382d894a0038040f4d21a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 13:17:42 +0000 Subject: [PATCH 30/87] Bump JDA from 4.1.1_125 to 4.1.1_126 Bumps JDA from 4.1.1_125 to 4.1.1_126. 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 ae03d75..49b6fc4 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_125 + 4.1.1_126 org.json From 3b8ffbdde305077144835b4b8a5de5c5fc48327f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 13:19:15 +0000 Subject: [PATCH 31/87] Bump rethinkdb-driver from 2.4.0 to 2.4.2 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.0 to 2.4.2. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/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 49b6fc4..e4c8f13 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.2 org.slf4j From 31ff3602f59706fce41c5a58b2413f8d733ed5a1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 13:18:54 +0000 Subject: [PATCH 32/87] Bump lavaplayer from 1.3.38 to 1.3.40 Bumps lavaplayer from 1.3.38 to 1.3.40. 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 e4c8f13..1378f8f 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.38 + 1.3.40 com.fasterxml.jackson.core From a2ff33800de3c03dc4cf0ed6961fcda81f347f14 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 13:19:18 +0000 Subject: [PATCH 33/87] Bump JDA from 4.1.1_126 to 4.1.1_127 Bumps JDA from 4.1.1_126 to 4.1.1_127. 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 e4c8f13..c987d01 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_126 + 4.1.1_127 org.json From b5fd95a99673baa5ab6818799b0020a218acb4ce Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 30 Mar 2020 16:16:40 +0200 Subject: [PATCH 34/87] Downgrade again --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0806038..104ba89 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.2 + 2.4.0 org.slf4j From 5b88891555803be1bdb7da812bcce21d2f3956eb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 30 Mar 2020 16:21:25 +0200 Subject: [PATCH 35/87] Update corona command --- .../java/com/bbn/hadder/commands/misc/CoronaCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java index 3f24ea5..fea5f27 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java @@ -31,13 +31,13 @@ public class CoronaCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.covid.stream/latest/numbers").build(); + Request request = new Request.Builder().url("https://corona.lmao.ninja/all").build(); try { Response response = client.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()).getJSONObject("data"); + JSONObject json = new JSONObject(response.body().string()); StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("`Confirmed cases:` **").append(json.get("totalConfirmedNumbers")).append("**\n").append("`Deaths:` **").append(json.get("totalDeathNumbers")).append("** \n").append("`Recovered:` **").append(json.get("totalRecoveredNumbers")).append("** \n"); + stringBuilder.append("`Confirmed cases:` **").append(json.get("cases")).append("**\n").append("`Deaths:` **").append(json.get("deaths")).append("** \n").append("`Recovered:` **").append(json.get("recovered")).append("** \n").append("`Active cases:` **").append(json.get("active")).append("**"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setDescription(stringBuilder).build()).queue(); } catch (IOException ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR) From 042dc8cbbb8b7f395265b098b60866705f6dfcf9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 30 Mar 2020 16:22:17 +0200 Subject: [PATCH 36/87] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 104ba89..0460e6c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.3.2 + 1.3.3 Hadder 2019 Hadder is a multi-purpose Discord bot. From 38595bb1d0cb95ab1866d7e98295ff53b3050970 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 30 Mar 2020 16:31:30 +0200 Subject: [PATCH 37/87] Debug --- src/main/java/com/bbn/hadder/Rethink.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 6be8bdd..f8d5ca6 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -78,6 +78,7 @@ public class Rethink { public JSONObject getObjectByID(String table, String id) { String response = r.table(table).get(id).toJson().run(conn); + System.out.println(response); return new JSONObject(response); } From 69623072daaae0189c5a5faa2362050b3d4c454c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 31 Mar 2020 14:40:50 +0200 Subject: [PATCH 38/87] Remove debug --- src/main/java/com/bbn/hadder/Rethink.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index f8d5ca6..6be8bdd 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -78,7 +78,6 @@ public class Rethink { public JSONObject getObjectByID(String table, String id) { String response = r.table(table).get(id).toJson().run(conn); - System.out.println(response); return new JSONObject(response); } From fc46756281b0254b64f03288cf4191ab6bf1d201 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 31 Mar 2020 14:53:33 +0200 Subject: [PATCH 39/87] It's better yk --- src/main/java/com/bbn/hadder/commands/music/PauseCommand.java | 4 ++-- src/main/resources/Translations/Translations_en.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java index baf55b0..3dcf47e 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java @@ -34,8 +34,8 @@ public class PauseCommand implements Command { .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, - "commands.music.pause.error.paused.title", - "commands.music.pause.error.paused.description") + "commands.music.pause.error.paused.title", "", + "commands.music.pause.error.paused.description", e.getRethinkServer().getPrefix()) .build()).queue(); } } else { diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 54ef718..98b2a88 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -274,7 +274,7 @@ commands.music.volume.help.description = Change the volume of the music. commands.music.pause.success.title = Successfully paused commands.music.pause.success.description = I successfully paused the played song. commands.music.pause.error.paused.title = Already paused -commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.paused.description = The song is already paused. You can continue playing it with %extra%play commands.music.pause.error.connected.title = No channel commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. commands.music.pause.help.description = Pause the playing song. From d47236291e088743a96b3c25279c79ed556077f9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 13:17:18 +0000 Subject: [PATCH 40/87] Bump rethinkdb-driver from 2.4.0 to 2.4.2 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.0 to 2.4.2. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/v2.4.0...v2.4.2) 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 0460e6c..5128cea 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.2 org.slf4j From 231ca28b225a6f236cf5577235ff872e2256b79e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 13:19:24 +0000 Subject: [PATCH 41/87] Bump lavaplayer from 1.3.40 to 1.3.41 Bumps lavaplayer from 1.3.40 to 1.3.41. 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 0460e6c..471ec89 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.40 + 1.3.41 com.fasterxml.jackson.core From 0282ada6dc71a0632a01a25f67a0e34fae718f13 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2020 13:19:05 +0000 Subject: [PATCH 42/87] Bump lavaplayer from 1.3.41 to 1.3.42 Bumps lavaplayer from 1.3.41 to 1.3.42. 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 471ec89..7f8bcb6 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.41 + 1.3.42 com.fasterxml.jackson.core From bd8cc488182816f0e0971710b21ec39dd42c66f2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2020 13:19:33 +0000 Subject: [PATCH 43/87] Bump github-api from 1.108 to 1.109 Bumps [github-api](https://github.com/github-api/github-api) from 1.108 to 1.109. - [Release notes](https://github.com/github-api/github-api/releases) - [Changelog](https://github.com/github-api/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/github-api/github-api/compare/github-api-1.108...github-api-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 471ec89..1edef19 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.108 + 1.109 com.sedmelluq From c6f2db6e5440ddb8b9d7ddef1ba5a767e9900b1f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 3 Apr 2020 13:00:06 +0200 Subject: [PATCH 44/87] Add member count to the code command --- src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java index a154bb2..9f22e89 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java @@ -31,7 +31,7 @@ public class CodeCommand implements Command { public void executed(String[] args, CommandEvent e) { if (args.length > 0) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/invite/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); + Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/invite/" + args[0] + "?with_counts=true").addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); try { Response response = client.newCall(request).execute(); @@ -45,6 +45,9 @@ public class CodeCommand implements Command { .addField("Verification Level", String.valueOf(json.getJSONObject("guild").getInt("verification_level")), true) .addField("Guild ID", json.getJSONObject("guild").getString("id"), true) .addBlankField(true) + .addField("Members", String.valueOf(json.get("approximate_member_count")), true) + .addBlankField(true) + .addBlankField(true) .setThumbnail("https://cdn.discordapp.com/icons/" + json.getJSONObject("guild").getString("id") + "/" + json.getJSONObject("guild").getString("icon") + ".png") .build()).queue(); } catch (JSONException ex) { From 8b7d07b9881643e483d4c998d8fa32240aca5075 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 3 Apr 2020 13:18:59 +0000 Subject: [PATCH 45/87] Bump lavaplayer from 1.3.42 to 1.3.43 Bumps lavaplayer from 1.3.42 to 1.3.43. 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 e9d8820..7d493dd 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.42 + 1.3.43 com.fasterxml.jackson.core From aa0637d237cf1b7ec8bb25b94e73df84db97ddae Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 13:19:41 +0000 Subject: [PATCH 46/87] Bump lavaplayer from 1.3.43 to 1.3.44 Bumps lavaplayer from 1.3.43 to 1.3.44. 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 7d493dd..40268a8 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.43 + 1.3.44 com.fasterxml.jackson.core From 3a5dc59b037cf4779fc9926853392d388d824b31 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 13:20:07 +0000 Subject: [PATCH 47/87] Bump JDA from 4.1.1_127 to 4.1.1_131 Bumps JDA from 4.1.1_127 to 4.1.1_131. 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 7d493dd..dd1d6dc 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_127 + 4.1.1_131 org.json From 295e88a89a027b35ebc0bb340a89cdc58732b2b4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 19:57:59 +0200 Subject: [PATCH 48/87] Add error msg --- .../hadder/commands/misc/MoveAllCommand.java | 23 ++++++++++++------- .../Translations/Translations_en.properties | 2 ++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java index b8d1dc6..3dbf7c0 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -30,14 +30,21 @@ public class MoveAllCommand implements Command { if (args.length == 2) { if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) { if (StringUtils.isNumeric(args[1]) && args[1].length() == 18) { - int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); - e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( - member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() - ); - e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.misc.moveall.success.title", "", - "commands.misc.moveall.success.description", String.valueOf(count)) - .build()).queue(); + if (!args[0].equals(args[1])) { + int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); + e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( + member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() + ); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.misc.moveall.success.title", "", + "commands.misc.moveall.success.description", String.valueOf(count)) + .build()).queue(); + } else { + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.misc.moveall.error.equals.title", + "commands.misc.moveall.error.equals.description") + .build()).queue(); + } } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.moveall.error.target.int.title", diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 98b2a88..4ae304a 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -100,6 +100,8 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.error.equals.title = Not twice +commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. commands.misc.moveall.error.source.int.title = Invalid ID commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. commands.misc.moveall.error.target.int.title = Invalid ID From 6ffb0a2d99333fd7754e8f434cbdcb1262a8af1b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 22:47:36 +0200 Subject: [PATCH 49/87] Implement bad fix --- src/main/java/com/bbn/hadder/Rethink.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 6be8bdd..5f8ee59 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -22,6 +22,7 @@ import com.rethinkdb.gen.exc.ReqlNonExistenceError; import com.rethinkdb.gen.exc.ReqlOpFailedError; import com.rethinkdb.net.Connection; import org.json.JSONArray; +import org.json.JSONException; import org.json.JSONObject; import java.lang.reflect.Field; @@ -78,7 +79,12 @@ public class Rethink { public JSONObject getObjectByID(String table, String id) { String response = r.table(table).get(id).toJson().run(conn); - return new JSONObject(response); + try { + return new JSONObject(response); + } catch (JSONException e) { + System.out.println(response); + return null; + } } public void insert(String table, Object object) { From cac8532f4117448388eaec1be06b40c6f93befef Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 23:03:26 +0200 Subject: [PATCH 50/87] bruh? --- .../java/com/bbn/hadder/listener/ReadyListener.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 51b3491..1277c1a 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -40,11 +40,13 @@ public class ReadyListener extends ListenerAdapter { public void onReady(@Nonnull ReadyEvent e) { rethink.setup(); new Thread(() -> { - for (User user : e.getJDA().getUsers()) { - if (!user.getId().equals(e.getJDA().getSelfUser().getId())) { - rethink.insertUser(user.getId()); - } - } + e.getJDA().getGuilds().forEach(guild -> guild.retrieveMembers().thenApply((v) -> guild.getMemberCache()).thenAccept((members) -> { + members.forEach((member) -> { + if (!member.getId().equals(e.getJDA().getSelfUser().getId())) { + rethink.insertUser(member.getId()); + } + }); + })); for (Guild g : e.getJDA().getGuilds()) { rethink.insertGuild(g.getId()); } From d85a6023019ff7abfd21fdd309a87976aba2bc09 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 23:08:27 +0200 Subject: [PATCH 51/87] test --- pom.xml | 2 +- .../java/com/bbn/hadder/listener/ReadyListener.java | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 787cd26..012aa5a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_131 + 4.1.1_101 org.json diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 1277c1a..51b3491 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -40,13 +40,11 @@ public class ReadyListener extends ListenerAdapter { public void onReady(@Nonnull ReadyEvent e) { rethink.setup(); new Thread(() -> { - e.getJDA().getGuilds().forEach(guild -> guild.retrieveMembers().thenApply((v) -> guild.getMemberCache()).thenAccept((members) -> { - members.forEach((member) -> { - if (!member.getId().equals(e.getJDA().getSelfUser().getId())) { - rethink.insertUser(member.getId()); - } - }); - })); + for (User user : e.getJDA().getUsers()) { + if (!user.getId().equals(e.getJDA().getSelfUser().getId())) { + rethink.insertUser(user.getId()); + } + } for (Guild g : e.getJDA().getGuilds()) { rethink.insertGuild(g.getId()); } From 0bc2fb1a3e7b7d68417326896c1b75323be798a3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 23:11:17 +0200 Subject: [PATCH 52/87] fix --- .../bbn/hadder/commands/moderation/RegionChangeCommand.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index 5e7efcf..cd81ab1 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -86,16 +86,13 @@ public class RegionChangeCommand implements Command { case "us-south": setRegion(Region.US_SOUTH, "US South", e); break; - case "south-korea": - setRegion(Region.SOUTH_KOREA, "South Korea", e); - break; default: e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.regionchange.regions.title", "") - .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london` `south korea`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") + .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") .build()).queue(); break; } From f7403ab3488c8dc0ab1a8695075fd8655fdef27b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 23:13:32 +0200 Subject: [PATCH 53/87] ceo --- src/main/java/com/bbn/hadder/Hadder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 4afe7ca..610a14c 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -51,7 +51,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.createDefault(config.getBotToken()); + DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder()); builder.setAutoReconnect(true); builder.setShardsTotal(1); @@ -59,6 +59,7 @@ public class Hadder { builder.setBulkDeleteSplittingEnabled(true); builder.setActivity(Activity.listening("to h.help")); builder.setStatus(OnlineStatus.DO_NOT_DISTURB); + builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); AudioManager audioManager = new AudioManager(); From 4ebf8603a0977c888140c29e89875d9d38e190b5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 23:15:12 +0200 Subject: [PATCH 54/87] kms --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 610a14c..81a3ae4 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -51,7 +51,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder()); + DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder(); builder.setAutoReconnect(true); builder.setShardsTotal(1); From a588815192f11dc957825eea533e8275fe211467 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 13:18:27 +0000 Subject: [PATCH 55/87] Bump lavaplayer from 1.3.44 to 1.3.46 Bumps lavaplayer from 1.3.44 to 1.3.46. 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 012aa5a..ded31a8 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.44 + 1.3.46 com.fasterxml.jackson.core From b9fbc8908992242590855879de1e92746ff124f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 13:18:51 +0000 Subject: [PATCH 56/87] Bump JDA from 4.1.1_101 to 4.1.1_133 Bumps JDA from 4.1.1_101 to 4.1.1_133. 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 012aa5a..e7f31e4 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_101 + 4.1.1_133 org.json From 840cf5f383ae630e8633c31dec7723405aee7d43 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 13:19:20 +0000 Subject: [PATCH 57/87] Bump github-api from 1.109 to 1.110 Bumps [github-api](https://github.com/github-api/github-api) from 1.109 to 1.110. - [Release notes](https://github.com/github-api/github-api/releases) - [Changelog](https://github.com/github-api/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/github-api/github-api/compare/github-api-1.109...github-api-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 012aa5a..3ea9a75 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.109 + 1.110 com.sedmelluq From 5cd0bab3a296424877c2aaae3546703e6164ecea Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:19:42 +0000 Subject: [PATCH 58/87] Bump JDA from 4.1.1_133 to 4.1.1_134 Bumps JDA from 4.1.1_133 to 4.1.1_134. 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 ece88bb..2e360f6 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_133 + 4.1.1_134 org.json From 04722d14ad309b6b37237f03b56dd0ab9b92ae96 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2020 13:18:45 +0000 Subject: [PATCH 59/87] Bump JDA from 4.1.1_134 to 4.1.1_136 Bumps JDA from 4.1.1_134 to 4.1.1_136. 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 2e360f6..11e1cc2 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_134 + 4.1.1_136 org.json From ad387ab051d82fe6d7c864941994808e38cc704c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 14 Apr 2020 13:19:19 +0000 Subject: [PATCH 60/87] Bump lavaplayer from 1.3.46 to 1.3.47 Bumps lavaplayer from 1.3.46 to 1.3.47. 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 11e1cc2..1405dfb 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.46 + 1.3.47 com.fasterxml.jackson.core From 3c77feb5909ef41c9419487ae5e1c436f562f6cd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2020 13:17:54 +0000 Subject: [PATCH 61/87] Bump github-api from 1.110 to 1.111 Bumps [github-api](https://github.com/github-api/github-api) from 1.110 to 1.111. - [Release notes](https://github.com/github-api/github-api/releases) - [Changelog](https://github.com/github-api/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/github-api/github-api/compare/github-api-1.110...github-api-1.111) 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 1405dfb..c84effa 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.110 + 1.111 com.sedmelluq From e5764b8c42292f0a275b08f358d253406646dd75 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 13:19:10 +0000 Subject: [PATCH 62/87] Bump JDA from 4.1.1_136 to 4.1.1_137 Bumps JDA from 4.1.1_136 to 4.1.1_137. 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 c84effa..8aef5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_136 + 4.1.1_137 org.json From 70e32ebbc664b6bbe947e9a7740df3352b244eb6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Apr 2020 18:18:36 +0200 Subject: [PATCH 63/87] Fix Corona command --- .../java/com/bbn/hadder/commands/misc/CoronaCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java index fea5f27..9cf00f7 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java @@ -31,13 +31,17 @@ public class CoronaCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("https://corona.lmao.ninja/all").build(); + Request request = new Request.Builder().url("https://corona.lmao.ninja/v2/all").build(); try { Response response = client.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("`Confirmed cases:` **").append(json.get("cases")).append("**\n").append("`Deaths:` **").append(json.get("deaths")).append("** \n").append("`Recovered:` **").append(json.get("recovered")).append("** \n").append("`Active cases:` **").append(json.get("active")).append("**"); + stringBuilder + .append("`Confirmed cases:` **").append(json.get("cases")).append("**\n") + .append("`Deaths:` **").append(json.get("deaths")).append("** \n") + .append("`Recovered:` **").append(json.get("recovered")).append("** \n") + .append("`Active cases:` **").append(json.get("active")).append("**"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setDescription(stringBuilder).build()).queue(); } catch (IOException ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR) From daa468989019e43db6df6101f57c8ec916cad62e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 27 Apr 2020 14:35:32 +0200 Subject: [PATCH 64/87] Fix NSFW commands --- .../java/com/bbn/hadder/commands/misc/CoronaCommand.java | 5 ++++- src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java | 2 +- .../java/com/bbn/hadder/commands/nsfw/FingeringCommand.java | 2 +- .../java/com/bbn/hadder/commands/nsfw/LickingCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java | 2 +- .../java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java | 2 +- 13 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java index 9cf00f7..a09a087 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java @@ -42,7 +42,10 @@ public class CoronaCommand implements Command { .append("`Deaths:` **").append(json.get("deaths")).append("** \n") .append("`Recovered:` **").append(json.get("recovered")).append("** \n") .append("`Active cases:` **").append(json.get("active")).append("**"); - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setDescription(stringBuilder).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor() + .getMessage(MessageEditor.MessageType.INFO) + .setDescription(stringBuilder) + .build()).queue(); } catch (IOException ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR) .setTitle("API Error") diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index da0baa4..b760ceb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -26,7 +26,7 @@ public class AnalCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/anal"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) .setImage(url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 50c43df..f47c0ef 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -27,7 +27,7 @@ public class BoobsCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/tits"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 95c291b..9207c05 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -27,7 +27,7 @@ public class CumCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/cum"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index f304f29..a46af5c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -27,7 +27,7 @@ public class FeetCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/feet"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index cf1d3c5..3eba6d1 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -27,7 +27,7 @@ public class FingeringCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index 4bc70be..3e199ff 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -27,7 +27,7 @@ public class LickingCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 6b9f037..9c181b1 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -27,7 +27,7 @@ public class PornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/classic"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index b2896d3..5a395b4 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -27,7 +27,7 @@ public class PussyCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://nekos.life/api/v2/img/pussy/"); + String url = Http.getNSFW("https://nekos.life/api/v2/img/pussy"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index 15a8be7..7c1518c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -27,7 +27,7 @@ public class RandomPornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags"); e.getTextChannel() .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index 7ad6e49..d3f8a28 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -27,7 +27,7 @@ public class SoloCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index 8f6535a..59805b0 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -27,7 +27,7 @@ public class SpankCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/spank"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index e72db47..439f284 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -27,7 +27,7 @@ public class TransCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Http.getNSFW("https://nekos.life/api/v2/img/trap/"); + String url = Http.getNSFW("https://nekos.life/api/v2/img/trap"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) From 4adf354889bac6109b7ba082700c7060b8ecf024 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 27 Apr 2020 14:42:06 +0200 Subject: [PATCH 65/87] Added arcane widget --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index db85607..34413f0 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime. [![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639) [![Hadder's Widget](https://api.botlist.space/widget/637002314162372639/2 "Hadder's Widget")](https://botlist.space/bot/637002314162372639?utm_source=bls&utm_medium=widget&utm_campaign=637002314162372639) [![Discord Bots](https://discordbotlist.com/bots/637002314162372639/widget)](https://discordbotlist.com/bots/637002314162372639) +[![Arcane Bot Center](https://arcane-botcenter.xyz/api/widget/637002314162372639.svg)](https://arcane-botcenter.xyz/bot/637002314162372639) ## Hadder Team ### Developer From ede113901d1c5ede721bd7c189ce4af3d3a02780 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 27 Apr 2020 14:43:34 +0200 Subject: [PATCH 66/87] Fix Arcane URL --- 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 3abfe8d..ebfa2c7 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -40,7 +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 static String ArcaneBotCenter = "https://arcane-center.xyz/api/637002314162372639/stats"; private Config config; From 9a7a2d4d4e58a55dbba844fcd997e4be56b20a6d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 27 Apr 2020 15:11:46 +0200 Subject: [PATCH 67/87] Bump API version --- 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 ebfa2c7..8b806cd 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -33,7 +33,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 DiscordBoats = "https://discord.boats/api/bot/637002314162372639"; + private static String DiscordBoats = "https://discord.boats/api/v2/bot/637002314162372639"; private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats"; private static String DiscordExtremeList = "https://api.discordextremelist.xyz/v1/bot/637002314162372639"; private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats"; From d6ebfa4146be811dcd966a9eeda1e08ac73fa61f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 13:19:29 +0000 Subject: [PATCH 68/87] Bump jackson-annotations from 2.10.3 to 2.11.0 Bumps [jackson-annotations](https://github.com/FasterXML/jackson) from 2.10.3 to 2.11.0. - [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 8aef5cb..3e35e8b 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.3 + 2.11.0 From 16220ec67b02d6e2a11476bd8b1175bf92836593 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 13:19:54 +0000 Subject: [PATCH 69/87] Bump JDA from 4.1.1_137 to 4.1.1_139 Bumps JDA from 4.1.1_137 to 4.1.1_139. 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 8aef5cb..c94d64b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_137 + 4.1.1_139 org.json From ba1d7d199bdb5c2c0d62666e4b45304b8672e663 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2020 13:17:30 +0000 Subject: [PATCH 70/87] Bump JDA from 4.1.1_139 to 4.1.1_140 Bumps JDA from 4.1.1_139 to 4.1.1_140. 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 c035519..4c3ade4 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_139 + 4.1.1_140 org.json From 59742edb974a3ccf35fa8d1c71967a822463dc3a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 30 Apr 2020 13:22:11 +0200 Subject: [PATCH 71/87] Remove old botlist --- src/main/java/com/bbn/hadder/utils/BotList.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 8b806cd..04374c8 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -39,7 +39,6 @@ public class BotList { private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats"; 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-center.xyz/api/637002314162372639/stats"; private Config config; @@ -197,21 +196,6 @@ public class BotList { e.printStackTrace(); } - // CloudList - - Request cloudlist = new Request.Builder() - .url(CloudList) - .post(body) - .addHeader("Authorization", config.getCloudListToken()) - .build(); - - try { - new OkHttpClient().newCall(cloudlist).execute().close(); - System.out.println("Successfully posted count to the CloudList!"); - } catch (IOException e) { - e.printStackTrace(); - } - // Arcane Bot Center Request arcane = new Request.Builder() From a1282a264d668edb05e3e5d30951e5560619ab09 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 13:17:25 +0000 Subject: [PATCH 72/87] Bump JDA from 4.1.1_140 to 4.1.1_142 Bumps JDA from 4.1.1_140 to 4.1.1_142. 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 4c3ade4..e5cb623 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_140 + 4.1.1_142 org.json From e71ce2a15db9233d71e5576cef58decd5c6bfcb1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 13:23:06 +0000 Subject: [PATCH 73/87] Bump discord-webhooks from 0.3.0 to 0.3.1 Bumps discord-webhooks from 0.3.0 to 0.3.1. 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 e5cb623..dc75f87 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ club.minnced discord-webhooks - 0.3.0 + 0.3.1 org.kohsuke From 4584244c836036f41392289393cf2a8c40f8cff8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 13:23:54 +0000 Subject: [PATCH 74/87] Bump JDA from 4.1.1_142 to 4.1.1_143 Bumps JDA from 4.1.1_142 to 4.1.1_143. 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 e5cb623..45b1b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_142 + 4.1.1_143 org.json From 5753db788cf54bbf16cffef2210024b742be71e6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 6 May 2020 13:17:25 +0000 Subject: [PATCH 75/87] Bump JDA from 4.1.1_143 to 4.1.1_144 Bumps JDA from 4.1.1_143 to 4.1.1_144. 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 966067e..9d65f18 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_143 + 4.1.1_144 org.json From ac8a90a5ebae2e7de30fe09e6919e3a5011f2708 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 May 2020 13:19:00 +0000 Subject: [PATCH 76/87] Bump JDA from 4.1.1_144 to 4.1.1_145 Bumps JDA from 4.1.1_144 to 4.1.1_145. 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 9d65f18..aebc900 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_144 + 4.1.1_145 org.json From 1ccbb01fdbfb2d6f307e50f250c3adb8549ebfb7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 May 2020 13:18:08 +0000 Subject: [PATCH 77/87] Bump JDA from 4.1.1_145 to 4.1.1_147 Bumps JDA from 4.1.1_145 to 4.1.1_147. 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 aebc900..d2189f7 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_145 + 4.1.1_147 org.json From 181c6bb485dd972edbdaeb69a6f4da297273aacb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 12 May 2020 13:17:41 +0000 Subject: [PATCH 78/87] Bump JDA from 4.1.1_147 to 4.1.1_148 Bumps JDA from 4.1.1_147 to 4.1.1_148. 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 d2189f7..5028ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_147 + 4.1.1_148 org.json From c9e8416ab1c6bc28dc1309f4789f61472f12abcc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 12 May 2020 17:16:14 +0200 Subject: [PATCH 79/87] test --- 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 81a3ae4..4afe7ca 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -51,7 +51,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder(); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.createDefault(config.getBotToken()); builder.setAutoReconnect(true); builder.setShardsTotal(1); @@ -59,7 +59,6 @@ public class Hadder { builder.setBulkDeleteSplittingEnabled(true); builder.setActivity(Activity.listening("to h.help")); builder.setStatus(OnlineStatus.DO_NOT_DISTURB); - builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); AudioManager audioManager = new AudioManager(); From 097cf42f56ecd3b68bd272f318d902eb40f4bd3d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 12 May 2020 17:25:43 +0200 Subject: [PATCH 80/87] Fix? --- 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 4afe7ca..9064649 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -29,6 +29,7 @@ import com.bbn.hadder.core.*; import com.bbn.hadder.listener.*; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Activity; +import net.dv8tion.jda.api.requests.GatewayIntent; import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; import net.dv8tion.jda.api.utils.ChunkingFilter; @@ -51,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.createDefault(config.getBotToken()); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS); builder.setAutoReconnect(true); builder.setShardsTotal(1); @@ -59,6 +60,7 @@ public class Hadder { builder.setBulkDeleteSplittingEnabled(true); builder.setActivity(Activity.listening("to h.help")); builder.setStatus(OnlineStatus.DO_NOT_DISTURB); + builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); AudioManager audioManager = new AudioManager(); From 065a6bb22c534451a52c567ff34f5ff7c5bed517 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 12 May 2020 17:30:16 +0200 Subject: [PATCH 81/87] Forgot this --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 9064649..54f1033 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES); builder.setAutoReconnect(true); builder.setShardsTotal(1); From 3ab7d38e3a3a8a1371fd15a1aef5ed2964cca65b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 12 May 2020 17:35:35 +0200 Subject: [PATCH 82/87] GVS --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 54f1033..6abd7b1 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES); builder.setAutoReconnect(true); builder.setShardsTotal(1); From 2693530116d0d5cf5fcb362c6ff457321b3f743c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 12 May 2020 17:37:14 +0200 Subject: [PATCH 83/87] A lot of intents xD --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 6abd7b1..476fee2 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS); builder.setAutoReconnect(true); builder.setShardsTotal(1); From dfa7c589422e0c36635540daf2be249023c762e4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 11:09:39 +0200 Subject: [PATCH 84/87] r u kidding me? --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 476fee2..4335d3b 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS, GatewayIntent.GUILD_MESSAGES); builder.setAutoReconnect(true); builder.setShardsTotal(1); From 11fb585997c81eba2f93b56bfcae78122fa82dce Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 11:47:55 +0200 Subject: [PATCH 85/87] Better code yk --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 4335d3b..2fe8cf3 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS, GatewayIntent.GUILD_MESSAGES); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(GatewayIntent.ALL_INTENTS)); builder.setAutoReconnect(true); builder.setShardsTotal(1); From 281d8d474d9530f7356b4dcb6d026bcd38987e00 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 13:16:51 +0000 Subject: [PATCH 86/87] Bump lavaplayer from 1.3.47 to 1.3.48 Bumps lavaplayer from 1.3.47 to 1.3.48. 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 5028ed4..ff9b491 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.47 + 1.3.48 com.fasterxml.jackson.core From 7ddec14f25b82ab036c53bb2beda5ad32ae8c91e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 13:17:20 +0000 Subject: [PATCH 87/87] Bump JDA from 4.1.1_148 to 4.1.1_149 Bumps JDA from 4.1.1_148 to 4.1.1_149. 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 5028ed4..1579f5b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_148 + 4.1.1_149 org.json