From c4f8648535e322a4bda8ca637b8e9abee97728c5 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 20 Mar 2020 23:59:31 +0100 Subject: [PATCH 01/27] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 8d5f954..9868dc3 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -316,7 +316,7 @@ commands.owner.guildleave.help.description = Quit from a server commands.owner.reboot.help.description = Startet den Bot neu. commands.owner.shutdown.success.title = Fährt herrunter commands.owner.shutdown.help.description = Schalte den Bot ab. -commands.owner.test.success = TEST my friends +commands.owner.test.success = Meine Freunde testen commands.owner.test.help.description = Nur ein kleiner Testbefehl commands.owner.blacklist.success.add.title = Successfully blacklisted the specified commands commands.owner.blacklist.success.add.description = I successfully added the following commands from the blacklist\:\n %extra% -- 2.45.3 From 7a2ccf0ac9ee924c807e6fb79a24c83d20dabaa8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:35 +0100 Subject: [PATCH 02/27] 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 9868dc3..ea975ce 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -100,6 +100,10 @@ commands.misc.code.error.description = Ich kann den angegebenen Einladungscode n 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 -- 2.45.3 From d8104b53ab32d346654d79d487307ef0075c13e9 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:36 +0100 Subject: [PATCH 03/27] 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 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 -- 2.45.3 From 3636c764caf0b0689617b87a66f835626a8d272a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:38 +0100 Subject: [PATCH 04/27] 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 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.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 -- 2.45.3 From 980abe1304842d402a4ca7f26790a466edeed554 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:39 +0100 Subject: [PATCH 05/27] 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 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.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 -- 2.45.3 From 3e3b9ee50a2ad54fc948891d2120d576a681a775 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:41 +0100 Subject: [PATCH 06/27] 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 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.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 -- 2.45.3 From 681834fcfccb5ace7fc3b32877295a675afea308 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:42 +0100 Subject: [PATCH 07/27] 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 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.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 -- 2.45.3 From c420508f2eb3e58a98178d7af7b2ea55b113ab26 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Mar 2020 00:39:44 +0100 Subject: [PATCH 08/27] 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 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.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 -- 2.45.3 From 8007a77ba06aeff8eddb04822339a2f523fae736 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Mar 2020 14:48:37 +0200 Subject: [PATCH 09/27] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index ea975ce..6fa4b95 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -97,12 +97,12 @@ commands.misc.code.success.title = Informationen zum Einladungscode commands.misc.code.success.description = Diese Nachricht enthält einige Informationen über den angegebenen Einladungscode. 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.code.help.description = Zeigt Informationen über einen Einladungs-Code. +commands.misc.moveall.success.title = Erfolgreich verschoben 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.title = Ungültige 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.title = Ungültige 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 -- 2.45.3 From 8a8606fd53a7731a52066801010ff4a314b3fb8f Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Mar 2020 15:12:07 +0200 Subject: [PATCH 10/27] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 6fa4b95..dffc65e 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -105,7 +105,7 @@ commands.misc.moveall.error.source.int.description = You didn't specified a ID a commands.misc.moveall.error.target.int.title = Ungültige 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 +commands.misc.corona.help.description = Zeigt die neuesten Statistiken von COVID-19 commands.moderation.ban.success.title = Erfolgreich gebannt commands.moderation.ban.success.description = Ich habe %extra% erfolgreich gebannt -- 2.45.3 From 844f4bd4eab5b9c99ab6e8a18633acd90aa22c24 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Mar 2020 15:12:09 +0200 Subject: [PATCH 11/27] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 54ef718..77bf8a0 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -105,7 +105,7 @@ commands.misc.moveall.error.source.int.description = You didn't specified a ID a 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 +commands.misc.corona.help.description = Shows the newest stats of COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% -- 2.45.3 From 2dd271ebf3c8dd639404f2a8aa686ceb68709c8d Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:03 +0200 Subject: [PATCH 12/27] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index dffc65e..2be75d8 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -274,7 +274,7 @@ commands.music.volume.help.description = Ändere die Lautstärke der Musik. commands.music.pause.success.title = Erfolgreich pausiert commands.music.pause.success.description = Ich habe den gespielten Song erfolgreich pausiert. commands.music.pause.error.paused.title = Bereits pausiert -commands.music.pause.error.paused.description = Das Lied ist bereits pausiert. +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 = Kein Kanal commands.music.pause.error.connected.description = Du musst im selben Sprachkanal wie der Bot sein, um den Song zu pausieren. commands.music.pause.help.description = Pausiere das abgespielte Lied. -- 2.45.3 From c5517d237b6ae04e608010816a6c931d4d9f3039 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:05 +0200 Subject: [PATCH 13/27] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 77bf8a0..835004c 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. -- 2.45.3 From 965bf9d3d8c4ecbaba21627e38dc600b2d066b2f Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:06 +0200 Subject: [PATCH 14/27] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 54ef718..98b2a88 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.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. -- 2.45.3 From 8a96a78b251d1a00f0331a347f11a7f9cffcb381 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:08 +0200 Subject: [PATCH 15/27] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 54ef718..98b2a88 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.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. -- 2.45.3 From 5784a2e12c998c6a75ea6e421af3df9a0bf76f75 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:10 +0200 Subject: [PATCH 16/27] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 54ef718..98b2a88 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.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. -- 2.45.3 From f89c176e382e04bdf4a7bb2a474580c06f487f54 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:11 +0200 Subject: [PATCH 17/27] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 54ef718..98b2a88 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.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. -- 2.45.3 From 1a96fa143a1ea713856803f08f9d6b6dc241dd47 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Mar 2020 16:40:13 +0200 Subject: [PATCH 18/27] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 54ef718..98b2a88 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.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. -- 2.45.3 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 19/27] 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 -- 2.45.3 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 20/27] 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 -- 2.45.3 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 21/27] 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 -- 2.45.3 From c6f2db6e5440ddb8b9d7ddef1ba5a767e9900b1f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 3 Apr 2020 13:00:06 +0200 Subject: [PATCH 22/27] 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) { -- 2.45.3 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 23/27] 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 -- 2.45.3 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 24/27] 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 -- 2.45.3 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 25/27] 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 -- 2.45.3 From 295e88a89a027b35ebc0bb340a89cdc58732b2b4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 19:57:59 +0200 Subject: [PATCH 26/27] 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 -- 2.45.3 From 6ffb0a2d99333fd7754e8f434cbdcb1262a8af1b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Apr 2020 22:47:36 +0200 Subject: [PATCH 27/27] 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) { -- 2.45.3