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 01/32] 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 -- 2.45.3 From 11fb585997c81eba2f93b56bfcae78122fa82dce Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 11:47:55 +0200 Subject: [PATCH 02/32] 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); -- 2.45.3 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 03/32] 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 -- 2.45.3 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 04/32] 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 -- 2.45.3 From 6737eb432cbddb866c8d1b04c04e6d5dbff74106 Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Wed, 13 May 2020 15:45:44 +0200 Subject: [PATCH 05/32] Fixed Rethink Stuff --- src/main/java/com/bbn/hadder/Rethink.java | 27 ++--------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 5f8ee59..8366e95 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -21,12 +21,10 @@ import com.rethinkdb.RethinkDB; 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; -import java.util.NoSuchElementException; public class Rethink { private RethinkDB r = RethinkDB.r; @@ -52,33 +50,12 @@ 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); - return new JSONArray(string); - } catch (NoSuchElementException e) { - return null; - } catch (Exception e) { - e.printStackTrace(); - } - return new JSONArray(); - } - - public Object get(String table, String where, String value, String column) { - JSONArray array = this.getAsArray(table, where, value); - if (array.length() > 0) - if (array.getJSONObject(0).has(column)) - return array.getJSONObject(0).get(column); - else return null; - else return null; - } - public Object getByID(String table, String where, String column) { - return r.table(table).get(where).getField(column).run(conn); + return r.table(table).get(where).getField(column).run(conn).first(); } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn); + String response = String.valueOf(r.table(table).get(id).toJson().run(conn).first()); try { return new JSONObject(response); } catch (JSONException e) { -- 2.45.3 From 0e20bcfc9a048188fd47585366682f019bcc6500 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 18:05:37 +0200 Subject: [PATCH 06/32] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b3ac33..da35d33 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.3.3 + 1.3.11 Hadder 2019 Hadder is a multi-purpose Discord bot. -- 2.45.3 From 66f90d35604aa9b85753c0e6f91dc8b0ba374680 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 18:18:01 +0200 Subject: [PATCH 07/32] Rethink --- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- src/main/java/com/bbn/hadder/RethinkServer.java | 2 +- src/main/java/com/bbn/hadder/RethinkUser.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 8366e95..069209f 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -140,7 +140,7 @@ public class Rethink { } } - public void pushServer(RethinkServer server) { + public void push(RethinkServer server) { JSONObject object = new JSONObject(); for (Field field : server.getClass().getDeclaredFields()) { if (!field.getName().equals("rethink")) { @@ -154,7 +154,7 @@ public class Rethink { r.table("server").get(server.getId()).update(object.toMap()).run(conn); } - public void pushUser(RethinkUser user) { + public void push(RethinkUser user) { JSONObject object = new JSONObject(); for (Field field : user.getClass().getDeclaredFields()) { if (!field.getName().equals("rethink")) { diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 200e13a..e54dfd9 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -128,6 +128,6 @@ public class RethinkServer { } public void push() { - rethink.pushServer(this); + rethink.push(this); } } diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index cc3b41d..0579947 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -76,6 +76,6 @@ public class RethinkUser { } public void push() { - rethink.pushUser(this); + rethink.push(this); } } -- 2.45.3 From 38c339beffe8147b61c6ef443885a5545c8dc999 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 13:22:32 +0000 Subject: [PATCH 08/32] Bump JDA from 4.1.1_149 to 4.1.1_150 Bumps JDA from 4.1.1_149 to 4.1.1_150. 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 da35d33..806c63b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_149 + 4.1.1_150 org.json -- 2.45.3 From c2278f81c55d24a4c570f2055ee40bfae6f162b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 May 2020 13:17:14 +0000 Subject: [PATCH 09/32] Bump JDA from 4.1.1_150 to 4.1.1_153 Bumps JDA from 4.1.1_150 to 4.1.1_153. 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 806c63b..a5294f3 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_150 + 4.1.1_153 org.json -- 2.45.3 From 1652d39e04a7e3fcd91bde3d4ddfb8bb6e379d9d Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Mon, 18 May 2020 17:57:47 +0200 Subject: [PATCH 10/32] nice --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../commands/owner/BlacklistCommand.java | 27 ++----------- .../hadder/listener/OwnerMessageListener.java | 40 +++++++++++++++++++ 3 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 2fe8cf3..ab8edbe 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -140,7 +140,8 @@ public class Hadder { new InviteLinkListener(rethink), new RulesListener(rethink), new StarboardListener(rethink), - new VoiceLeaveListener(audioManager)); + new VoiceLeaveListener(audioManager), + new OwnerMessageListener(config)); try { shardManager = builder.build(); diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 5724fa0..50555a4 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -39,33 +39,14 @@ public class BlacklistCommand implements Command { } else { switch (args[0].toLowerCase()) { case "add": - if (args.length == 3 && e.getMessage().getMentionedUsers().size() == 1) { - RethinkUser u = new RethinkUser(e.getRethink().getObjectByID("user", e.getMessage().getMentionedUsers().get(0).getId()), e.getRethink()); - String blacklisted = e.getRethinkUser().getBlacklisted(); - List commands = new ArrayList<>(); - if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); - commands.addAll(Arrays.asList(args[1].split(","))); - LinkedHashSet hashSet = new LinkedHashSet<>(commands); - - ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); - String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - u.setBlacklisted(newblacklisted); - e.getTextChannel().sendMessage( - e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.owner.blacklist.success.add.title", "", - "commands.owner.blacklist.success.add.description", newblacklisted) - .build()).queue(); - u.push(); - } else e.getHelpCommand().sendHelp(this, e); - break; - case "remove": if (args.length == 3 && e.getMessage().getMentionedUsers().size() == 1) { RethinkUser u = new RethinkUser(e.getRethink().getObjectByID("user", e.getMessage().getMentionedUsers().get(0).getId()), e.getRethink()); String blacklisted = e.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); - commands.removeAll(Arrays.asList(args[1].split(","))); + if (args[0].toLowerCase().equals("add")) commands.addAll(Arrays.asList(args[1].split(","))); + else commands.removeAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); @@ -73,8 +54,8 @@ public class BlacklistCommand implements Command { u.setBlacklisted(newblacklisted); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.owner.blacklist.success.remove.title", "", - "commands.owner.blacklist.success.remove.description", newblacklisted) + "commands.owner.blacklist.success."+args[0].toLowerCase()+".title", "", + "commands.owner.blacklist.success."+args[0].toLowerCase()+".description", newblacklisted) .build()).queue(); u.push(); } else e.getHelpCommand().sendHelp(this, e); diff --git a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java new file mode 100644 index 0000000..be14cae --- /dev/null +++ b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java @@ -0,0 +1,40 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder.listener; + +import com.bbn.hadder.core.Config; +import com.bbn.hadder.core.Perms; +import net.dv8tion.jda.api.entities.Emote; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.json.JSONObject; + +import javax.annotation.Nonnull; + +public class OwnerMessageListener extends ListenerAdapter { + + Config config; + + public OwnerMessageListener(Config config) { + this.config = config; + } + + @Override + public void onMessageReceived(@Nonnull MessageReceivedEvent event) { + if (config.getOwners().contains(event.getAuthor().getIdLong())) { + String emotename = event.getMessage().getContentRaw().split(":")[1]; + if (!emotename.contains(" ")) { + Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]); + StringBuilder sb = new StringBuilder(); + if (emotes.length!=0) { + for (Emote emote : emotes) { + sb.append(emote.getAsMention() + " "); + } + event.getChannel().sendMessage(sb.toString()).queue(); + } + } + } + } +} -- 2.45.3 From 7760f0c11d1a4495d1e46b6148c444ed5f8fda80 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 13:18:06 +0000 Subject: [PATCH 11/32] Bump rethinkdb-driver from 2.4.2 to 2.4.3 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/v2.4.2...2.4.3) 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 a5294f3..aeaaf9f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.2 + 2.4.3 org.slf4j -- 2.45.3 From 9497aeaf0bda1c88c88fe7ea148f5b566418ef5b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 13:18:33 +0000 Subject: [PATCH 12/32] Bump JDA from 4.1.1_153 to 4.1.1_154 Bumps JDA from 4.1.1_153 to 4.1.1_154. 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 a5294f3..26072d7 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_153 + 4.1.1_154 org.json -- 2.45.3 From 75e9745233f685a658a67acfe8ef76584fae9838 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 21 May 2020 20:45:23 +0200 Subject: [PATCH 13/32] Fix emote stuff --- .../java/com/bbn/hadder/listener/OwnerMessageListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java index be14cae..010c531 100644 --- a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java @@ -23,14 +23,14 @@ public class OwnerMessageListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (config.getOwners().contains(event.getAuthor().getIdLong())) { + if (config.getOwners().contains(event.getAuthor().getIdLong()) && event.getMessage().getContentRaw().startsWith(":") && event.getMessage().getContentRaw().endsWith(":")) { String emotename = event.getMessage().getContentRaw().split(":")[1]; if (!emotename.contains(" ")) { Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]); StringBuilder sb = new StringBuilder(); if (emotes.length!=0) { for (Emote emote : emotes) { - sb.append(emote.getAsMention() + " "); + sb.append(emote.getAsMention()).append(" "); } event.getChannel().sendMessage(sb.toString()).queue(); } -- 2.45.3 From 8b0ee12c3c520849b3a7129f754c1c17dfc4eefa Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 22 May 2020 13:17:51 +0000 Subject: [PATCH 14/32] Bump lavaplayer from 1.3.48 to 1.3.49 Bumps lavaplayer from 1.3.48 to 1.3.49. 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 f930cad..40f43bd 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.48 + 1.3.49 com.fasterxml.jackson.core -- 2.45.3 From 75303b6c198cfb9699a393df6ebb0759cf39278f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 May 2020 13:17:30 +0000 Subject: [PATCH 15/32] Bump JDA from 4.1.1_154 to 4.1.1_155 Bumps JDA from 4.1.1_154 to 4.1.1_155. 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 40f43bd..36d35fa 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_154 + 4.1.1_155 org.json -- 2.45.3 From 654a8a24162a6ca75104897e9312b21695644172 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 May 2020 13:17:51 +0000 Subject: [PATCH 16/32] Bump json from 20190722 to 20200518 Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20200518. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Commits](https://github.com/douglascrockford/JSON-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 40f43bd..ef6e4bb 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ org.json json - 20190722 + 20200518 com.rethinkdb -- 2.45.3 From 5f6357d8ada137aba65fee032dff575bcce80c7d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 28 May 2020 13:17:55 +0000 Subject: [PATCH 17/32] Bump maven-project-info-reports-plugin from 3.0.0 to 3.1.0 Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases) - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.0.0...maven-project-info-reports-plugin-3.1.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 dc82ae3..50391be 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ maven-project-info-reports-plugin - 3.0.0 + 3.1.0 -- 2.45.3 From 4eceb937a519e3a6bc96dc4eea67f78e643459fa Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 29 May 2020 13:17:00 +0000 Subject: [PATCH 18/32] Bump github-api from 1.111 to 1.112 Bumps [github-api](https://github.com/hub4j/github-api) from 1.111 to 1.112. - [Release notes](https://github.com/hub4j/github-api/releases) - [Changelog](https://github.com/hub4j/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/hub4j/github-api/compare/github-api-1.111...github-api-1.112) 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 50391be..bfde919 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.111 + 1.112 com.sedmelluq -- 2.45.3 From ad833e1307d8503571d26f6901e8fbd49e81e8cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 13:15:47 +0000 Subject: [PATCH 19/32] Bump JDA from 4.1.1_155 to 4.1.1_156 Bumps JDA from 4.1.1_155 to 4.1.1_156. 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 bfde919..197e682 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_155 + 4.1.1_156 org.json -- 2.45.3 From 0a737f14f1a523ea2dc308163803fa8a3fb50381 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 13:15:55 +0000 Subject: [PATCH 20/32] Bump JDA from 4.1.1_156 to 4.1.1_157 Bumps JDA from 4.1.1_156 to 4.1.1_157. 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 197e682..013d36c 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_156 + 4.1.1_157 org.json -- 2.45.3 From 7ff1b4c701cb3845b8aa8f8af84c152ffc1af53c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 13:16:22 +0000 Subject: [PATCH 21/32] Bump rethinkdb-driver from 2.4.3 to 2.4.4 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/2.4.3...v2.4.4) 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 197e682..0aec8db 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.3 + 2.4.4 org.slf4j -- 2.45.3 From 9b6a6722398eb9d1355cab73e4a7c7c2717865b9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 7 Jun 2020 18:31:40 +0200 Subject: [PATCH 22/32] Move Rethink stuff in an extra db folder --- src/main/java/com/bbn/hadder/Hadder.java | 1 + src/main/java/com/bbn/hadder/commands/CommandEvent.java | 6 +++--- .../com/bbn/hadder/commands/owner/BlacklistCommand.java | 2 +- src/main/java/com/bbn/hadder/core/CommandHandler.java | 6 +++--- src/main/java/com/bbn/hadder/{ => db}/Rethink.java | 6 +++--- src/main/java/com/bbn/hadder/{ => db}/RethinkServer.java | 4 ++-- src/main/java/com/bbn/hadder/{ => db}/RethinkUser.java | 4 ++-- src/main/java/com/bbn/hadder/listener/CommandListener.java | 6 +++--- src/main/java/com/bbn/hadder/listener/GuildListener.java | 2 +- .../java/com/bbn/hadder/listener/InviteLinkListener.java | 4 ++-- src/main/java/com/bbn/hadder/listener/MentionListener.java | 6 +++--- .../com/bbn/hadder/listener/PrivateMessageListener.java | 4 ++-- src/main/java/com/bbn/hadder/listener/ReadyListener.java | 2 +- src/main/java/com/bbn/hadder/listener/RulesListener.java | 4 ++-- .../java/com/bbn/hadder/listener/StarboardListener.java | 4 ++-- src/main/java/com/bbn/hadder/utils/MessageEditor.java | 2 +- 16 files changed, 32 insertions(+), 31 deletions(-) rename src/main/java/com/bbn/hadder/{ => db}/Rethink.java (97%) rename src/main/java/com/bbn/hadder/{ => db}/RethinkServer.java (97%) rename src/main/java/com/bbn/hadder/{ => db}/RethinkUser.java (95%) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index ab8edbe..3499a7b 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -26,6 +26,7 @@ import com.bbn.hadder.commands.fun.*; import com.bbn.hadder.commands.settings.*; import com.bbn.hadder.commands.music.*; import com.bbn.hadder.core.*; +import com.bbn.hadder.db.Rethink; import com.bbn.hadder.listener.*; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Activity; diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java index 90b1d8b..73dc632 100644 --- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java +++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java @@ -16,9 +16,9 @@ package com.bbn.hadder.commands; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; +import com.bbn.hadder.db.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.core.CommandHandler; diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 50555a4..b097af1 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -16,7 +16,7 @@ package com.bbn.hadder.commands.owner; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.RethinkUser; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 7ab130a..a5ecd97 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -16,9 +16,9 @@ package com.bbn.hadder.core; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; +import com.bbn.hadder.db.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/db/Rethink.java similarity index 97% rename from src/main/java/com/bbn/hadder/Rethink.java rename to src/main/java/com/bbn/hadder/db/Rethink.java index 069209f..c359350 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/db/Rethink.java @@ -10,11 +10,11 @@ * 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 + * See the License for the specific language governing permissions and * limitations under the License. */ -package com.bbn.hadder; +package com.bbn.hadder.db; import com.bbn.hadder.core.Config; import com.rethinkdb.RethinkDB; @@ -31,7 +31,7 @@ public class Rethink { private Connection conn; private Config config; - Rethink(Config config) { + public Rethink(Config config) { this.config = config; } diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/db/RethinkServer.java similarity index 97% rename from src/main/java/com/bbn/hadder/RethinkServer.java rename to src/main/java/com/bbn/hadder/db/RethinkServer.java index e54dfd9..0993922 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/db/RethinkServer.java @@ -10,11 +10,11 @@ * 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 + * See the License for the specific language governing permissions and * limitations under the License. */ -package com.bbn.hadder; +package com.bbn.hadder.db; import org.json.JSONObject; diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/db/RethinkUser.java similarity index 95% rename from src/main/java/com/bbn/hadder/RethinkUser.java rename to src/main/java/com/bbn/hadder/db/RethinkUser.java index 0579947..ba65bc3 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/db/RethinkUser.java @@ -10,11 +10,11 @@ * 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 + * See the License for the specific language governing permissions and * limitations under the License. */ -package com.bbn.hadder; +package com.bbn.hadder.db; import org.json.JSONObject; diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index 286d320..0defad9 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -16,9 +16,9 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; +import com.bbn.hadder.db.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.core.CommandHandler; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 91204ca..a35ce21 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -16,7 +16,7 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; +import com.bbn.hadder.db.Rethink; import com.bbn.hadder.core.Config; import com.bbn.hadder.utils.BotList; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index ea00e93..69dddfd 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -16,8 +16,8 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 7fb9e11..2ac4e3d 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -16,9 +16,9 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; +import com.bbn.hadder.db.RethinkUser; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index fc258f9..8e94bbe 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -16,8 +16,8 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkUser; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.ChannelType; diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 51b3491..2262453 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -16,7 +16,7 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; +import com.bbn.hadder.db.Rethink; import com.bbn.hadder.core.Config; import com.bbn.hadder.utils.BotList; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 8ee5fc4..a04662f 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -16,8 +16,8 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 2467ad5..060777b 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -16,8 +16,8 @@ package com.bbn.hadder.listener; -import com.bbn.hadder.Rethink; -import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.db.Rethink; +import com.bbn.hadder.db.RethinkServer; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.entities.MessageReaction; diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index c760b70..aac0d8c 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -16,7 +16,7 @@ package com.bbn.hadder.utils; -import com.bbn.hadder.RethinkUser; +import com.bbn.hadder.db.RethinkUser; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; -- 2.45.3 From e40a59fe1411e1b1536834d7525c8271a528d081 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 7 Jun 2020 18:31:54 +0200 Subject: [PATCH 23/32] Remove not needed space --- src/main/java/com/bbn/hadder/db/Rethink.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/db/Rethink.java b/src/main/java/com/bbn/hadder/db/Rethink.java index c359350..6651a39 100644 --- a/src/main/java/com/bbn/hadder/db/Rethink.java +++ b/src/main/java/com/bbn/hadder/db/Rethink.java @@ -10,7 +10,7 @@ * 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 + * See the License for the specific language governing permissions and * limitations under the License. */ -- 2.45.3 From 4c4389b392a0a08f449bf2ff517cdd29fdb9a90d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 8 Jun 2020 13:40:48 +0200 Subject: [PATCH 24/32] Fix some stuff --- src/main/java/com/bbn/hadder/Hadder.java | 1 - .../hadder/commands/music/LeaveCommand.java | 69 ------------------- .../hadder/commands/music/SkipCommand.java | 12 ++-- .../hadder/commands/music/StopCommand.java | 3 +- .../Translations/Translations_en.properties | 7 -- 5 files changed, 10 insertions(+), 82 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 3499a7b..9b26ccd 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -99,7 +99,6 @@ public class Hadder { new AvatarCommand(), new EvalCommand(), new JoinCommand(), - new LeaveCommand(), new GuildLeaveCommand(), new MemeCommand(), new InviteDetectCommand(), diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java deleted file mode 100644 index d63cdb1..0000000 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.music; - -import com.bbn.hadder.commands.Command; -import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.utils.MessageEditor; - -public class LeaveCommand implements Command { - - @Override - public void executed(String[] args, CommandEvent e) { - if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { - if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { - e.getGuild().getAudioManager().closeAudioConnection(); - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.leave.success.title", - "commands.music.leave.success.description") - .build()).queue(); - } else { - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, - "commands.music.leave.error.channel.title", - "commands.music.leave.error.channel.description") - .build()).queue(); - } - } else { - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( - MessageEditor.MessageType.ERROR, - "commands.music.leave.error.connected.tile", - "commands.music.leave.error.connected.description") - .build()).queue(); - } - } - - @Override - public String[] labels() { - return new String[]{"leave", "quit"}; - } - - @Override - public String description() { - return "commands.music.leave.help.description"; - } - - @Override - public String usage() { - return null; - } - - @Override - public String example() { - return null; - } -} diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index be1a5b1..f7bd31c 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -26,10 +26,14 @@ public class SkipCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getAudioManager().hasPlayer(e.getGuild()) && !e.getAudioManager().getTrackManager(e.getGuild()).getQueuedTracks().isEmpty()) { if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { - e.getAudioManager().forceSkipTrack(e); - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.skip.success.title", - "commands.music.skip.success.description").build()).queue(); + if (!e.getAudioManager().getTrackManager(e.getGuild()).isLoop()) { + e.getAudioManager().forceSkipTrack(e); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.skip.success.title", + "commands.music.skip.success.description").build()).queue(); + } else { + e.getTextChannel().sendMessage("Get rekt lol Mach Loop aus noob").queue(); + } } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.skip.error.connected.title", diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index e11dfac..96a1811 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -26,6 +26,7 @@ public class StopCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false); e.getAudioManager().players.remove(e.getGuild().getId()); e.getAudioManager().getPlayer(e.getGuild()).destroy(); e.getAudioManager().getTrackManager(e.getGuild()).purgeQueue(); @@ -48,7 +49,7 @@ public class StopCommand implements Command { @Override public String[] labels() { - return new String[]{"stop"}; + return new String[]{"stop", "leave"}; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3 From b44da1a8b80b201abf8677639b3f3af257d30476 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 8 Jun 2020 13:44:18 +0200 Subject: [PATCH 25/32] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f930cad..880242b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.3.11 + 1.3.14 Hadder 2019 Hadder is a multi-purpose Discord bot. -- 2.45.3 From 3f6950fe71e52e27a77610e4e08ecdf593db0011 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:51:56 +0200 Subject: [PATCH 26/32] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3 From c8b39ed685c925fdb577df3513f1e914ed8d8483 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:51:57 +0200 Subject: [PATCH 27/32] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3 From d38e490f8a7f16645524f50db00a3f8b1aa14033 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:51:59 +0200 Subject: [PATCH 28/32] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 6322a4d..58503a4 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = Du befindest dich nicht in einem commands.music.join.error.permission.title = Keine Berechtigung commands.music.join.error.permission.description = Ich bin nicht Berechtigt deinem Sprachkanal beizutreten. commands.music.join.help.description = Tritt deinem Sprachkanal bei. -commands.music.leave.success.title = Verbindung erfolgreich getrennt -commands.music.leave.success.description = Ich habe die Verbindung zum Sprachkanal erfolgreich getrennt -commands.music.leave.error.channel.title = Kein Kanal -commands.music.leave.error.channel.description = Du musst im selben Sprachkanal wie der Bot sein. -commands.music.leave.error.connected.tile = Nicht verbunden -commands.music.leave.error.connected.description = Ich bin derzeit in keinem Sprachkanal auf diesem Server -commands.music.leave.help.description = Verlässt einen Sprachkanal. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Versuche das Lied zu laden... commands.music.play.success.loading.title = %extra% Jetzt läuft %extra% -- 2.45.3 From 7e3c91bf5368a24e54880eed45a457953577f863 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:52:00 +0200 Subject: [PATCH 29/32] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3 From 77973d94ab2e34ff6df36871d49d313d971a5cd4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:52:02 +0200 Subject: [PATCH 30/32] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3 From 5d09fdf3a67954eb04e245995a2148db960db9bc Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:52:03 +0200 Subject: [PATCH 31/32] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3 From 5fc393b81f0374dd53e152a858fe49772f89c83e Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 8 Jun 2020 13:52:04 +0200 Subject: [PATCH 32/32] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 043a3f1..a68515b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.error.permission.title = No permission commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.channel.title = No channel -commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. -commands.music.leave.error.connected.tile = Not connected -commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% -- 2.45.3