From 54c4898a0d1810f71300c4d468c3ae9e49b0d71f Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:10:58 +0100 Subject: [PATCH 01/97] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 6e6e7af..a1bc2d6 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Fährt herrunter commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From 3c6e940efcc24c2fecf3e4fbb0b576bfc3ce008b Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:10:59 +0100 Subject: [PATCH 02/97] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From 7a6360cef07bfd4e7d9d288188bb643bc4c75a5a Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:00 +0100 Subject: [PATCH 03/97] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From 75eb635b136627169dc68eeb3bc1e9c6047b4f44 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:02 +0100 Subject: [PATCH 04/97] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From ea5b80a0c95ffb1fce82a15bdb3fd7519424eddf Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:03 +0100 Subject: [PATCH 05/97] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From aefcc0b8e30ed9d11ed0e8c0aa4b0433a6a759d8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:04 +0100 Subject: [PATCH 06/97] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From 6dfa336a854bd7bb48ec5456c759cccd45f84d35 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:05 +0100 Subject: [PATCH 07/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. From 190131f355a4d26b511942c262f8029ed5be6e42 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:10:45 +0100 Subject: [PATCH 08/97] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index a1bc2d6..a6c3d1c 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -29,10 +29,10 @@ commands.general.equals.string.equals.false = Ja, aber eigentlich nein. Das ist commands.general.equals.string.first = Erster String\: commands.general.equals.string.second = Zweiter String\: commands.general.equals.string.result = Ergebnis\: -commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.description = **Description\:** +commands.general.equals.help.description = Prüft, ob zwei Strings gleich sind. +commands.general.help.description = **Beschreibung\:** commands.general.help.usage = **Benutzung\:** -commands.general.help.example = **Example\:** +commands.general.help.example = **Beispiel\:** commands.general.help.error.description = Ich brauche die Links Einbetten Berechtigung, um das Hilfe-Menü zu senden\! commands.general.help.help.description = Zeigt jeden Befehl an und erklärt seine Verwendung. commands.general.help.help.label = [Name des Commands] From ec25c6f3483fae28c7aa63907ccf406f19ed77e3 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:20:47 +0100 Subject: [PATCH 09/97] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index a6c3d1c..a7656d1 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -56,10 +56,10 @@ commands.misc.github.success.repositories = Öffentliche Repositories commands.misc.github.success.gists = Öffentliche Gists commands.misc.github.success.followers = Abonnenten commands.misc.github.success.following = Folgt -commands.misc.github.api.error.title = API error +commands.misc.github.api.error.title = API-Fehler commands.misc.github.api.error.description = Die GitHub API könnte im Moment nicht verfügbar sein\! -commands.misc.github.user.error.title = User doesn't exist -commands.misc.github.user.error.description = I can not find a user named like this\! +commands.misc.github.user.error.title = Benutzer existiert nicht +commands.misc.github.user.error.description = Ich kann keinen Benutzer finden der so heißt\! commands.misc.github.connect.title = Verbinde dein GH Konto commands.misc.github.connect.description = [Bitte verbinde dein GitHub-Konto hier]%extra% commands.misc.github.help.description = Zeigt Informationen über ein GitHub Benutzerprofil an. @@ -79,11 +79,11 @@ commands.moderation.ban.success.description = Ich habe %extra% erfolgreich geban commands.moderation.ban.error.title = Nicht möglich commands.moderation.ban.myself.error.description = Ich kann mich nicht selbst bannen\! commands.moderation.ban.yourself.error.description = Du kannst dich nicht selbst bannen\! -commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! -commands.moderation.ban.help.description = Bans one or more users from the server. +commands.moderation.ban.massban.success.description = Ich habe erfolgreich %extra% Mitglieder gebannt\! +commands.moderation.ban.help.description = Bannt einen oder mehrere Benutzer vom Server. commands.moderation.lear.all.success.title = Erfolgreich gelöscht commands.moderation.lear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. -commands.moderation.clear.number.error.title = Invalid number +commands.moderation.clear.number.error.title = Ungültige Nummer commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! commands.moderation.clear.success.title = Erfolgreich gelöscht commands.moderation.clear.success.description.singular = Nachricht erfolgreich gelöscht. @@ -96,7 +96,7 @@ commands.moderation.prefix.success.description = Ich habe den neuen Prefix für commands.moderation.prefix.error.description = Der Prefix darf nicht **"** enthalten commands.moderation.prefix.help.description = Legt den Guild-Prefix fest. commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild aktiviert. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert From 5e96768fe8a53bd478dd96a3a4c915d7bd00d25d Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:30:47 +0100 Subject: [PATCH 10/97] 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 a7656d1..b9b30fb 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -98,7 +98,7 @@ commands.moderation.prefix.help.description = Legt den Guild-Prefix fest. commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild aktiviert. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.activate.error.description = Die Einladungs-Link-Erkennung ist bereits auf dieser Guild aktiviert. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert From 8909529a9d40fb286f7c3dcda9728da76e44e612 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:40:39 +0100 Subject: [PATCH 11/97] 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 b9b30fb..dabed7c 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -100,7 +100,7 @@ commands.moderation.invitedetect.activate.success.description = Ich habe erfolgr commands.moderation.invitedetect.activate.error.title = Bereits aktiviert commands.moderation.invitedetect.activate.error.description = Die Einladungs-Link-Erkennung ist bereits auf dieser Guild aktiviert. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild deaktiviert. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = Die Einladungslink-Erkennung ist auf dieser Guild bereits deaktiviert. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. From 484f275a11a4f6ee35815b22007925b1e81f7169 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:06 +0100 Subject: [PATCH 12/97] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index dabed7c..bb8bd49 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback-Thema commands.misc.feedback.title.request.description = Bitte senden Sie mir das Thema des Feedbacks. commands.misc.feedback.description.request.title = Feedback Beschreibung commands.misc.feedback.description.request.description = Bitte senden Sie mir jetzt die Feedback Beschreibung. -commands.misc.feedback.help.description = Sendet Feedback direkt an die Entwickler. commands.misc.feedback.success.title = Feedback erfolgreich gesendet\! +commands.misc.feedback.help.description = Sendet Feedback direkt an die Entwickler. commands.misc.github.link.title = Verbinde dein GitHub Konto commands.misc.github.success.title = Informationen über %extra% commands.misc.github.success.bio = Biographie @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = Ich kann mich nicht selbst ba commands.moderation.ban.yourself.error.description = Du kannst dich nicht selbst bannen\! commands.moderation.ban.massban.success.description = Ich habe erfolgreich %extra% Mitglieder gebannt\! commands.moderation.ban.help.description = Bannt einen oder mehrere Benutzer vom Server. -commands.moderation.lear.all.success.title = Erfolgreich gelöscht -commands.moderation.lear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. +commands.moderation.clear.all.success.title = Erfolgreich gelöscht +commands.moderation.clear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. commands.moderation.clear.number.error.title = Ungültige Nummer commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! commands.moderation.clear.success.title = Erfolgreich gelöscht @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Rolle existiert nicht commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Falsche Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Kanal konnte nicht gefunden werden @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Nicht verbunden commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild -commands.music.leave.help.description = Verlässt einen Sprachkanal +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From f7cf03c239a6a45515930bb56fdaa69fc35a7688 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:07 +0100 Subject: [PATCH 13/97] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From 3b38f706554563a72b78b63d57767deb96eb3848 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:09 +0100 Subject: [PATCH 14/97] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From c47c4eaf34110622e26689da842738cd27877ef6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:10 +0100 Subject: [PATCH 15/97] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From 7638a89f280414946b501c347fbd4cf758b0239d Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:11 +0100 Subject: [PATCH 16/97] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From b480ea457f66f131108a9b22e200435af67a3618 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:13 +0100 Subject: [PATCH 17/97] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From a6b436a475336b2110eee8aa2db8ce1262605b9e Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:14 +0100 Subject: [PATCH 18/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins 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.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +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% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From a894d1463204ce74edda1815e4346082dbe028f0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 22:10:30 +0100 Subject: [PATCH 19/97] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index bb8bd49..f65e9cf 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -178,39 +178,39 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a 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.join.help.description = Tretet 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.tile = Nicht verbunden commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser 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% -commands.music.play.success.title = Title -commands.music.play.success.author = Author -commands.music.play.success.length = Length +commands.music.play.success.loading.title = spielt jetzt +commands.music.play.success.title = Titel +commands.music.play.success.author = Autor +commands.music.play.success.length = Länge commands.music.play.success.tracks = Tracks -commands.music.play.error.load.title = %extra% Load failed %extra% -commands.music.play.error.load.description = Unfortunately I can not load the given song +commands.music.play.error.load.title = Laden fehlgeschlagen +commands.music.play.error.load.description = Leider kann ich das angegebene Lied nicht laden commands.music.play.error.match.title = %extra% No matches %extra% -commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays the specified song. -commands.music.stop.success.title = Successfully stopped -commands.music.stop.success.description = I successfully stopped the song. -commands.music.stop.help.description = Stops the song. +commands.music.play.error.match.description = Ich kann keinen Song mit dem Namen auf YouTube finden +commands.music.play.help.description = Spielt den angegebenen Song ab. +commands.music.stop.success.title = Erfolgreich gestoppt +commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. +commands.music.stop.help.description = Stoppt den Song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song. -commands.music.queue.error.title = No queue -commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.info.help.description = Zeigt Informationen über das abgespielte Lied. +commands.music.queue.error.title = Keine Warteschlange +commands.music.queue.error.description = Momentan sind keine Lieder in der Warteschlange +commands.music.queue.success.title = Warteschlange commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. -commands.music.skip.success.title = Successfully skipped -commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song. +commands.music.skip.success.title = Erfolgreich übersprungen +commands.music.skip.success.description = Ich habe erfolgreich zum nächsten Song übersprungen +commands.music.skip.help.description = Überspringt den gerade abgespielten Song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number From 3f58aacb9d1070646cdba626a4361cf244d15082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 00:00:29 +0100 Subject: [PATCH 20/97] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index f65e9cf..151f946 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -96,11 +96,11 @@ commands.moderation.prefix.success.description = Ich habe den neuen Prefix für commands.moderation.prefix.error.description = Der Prefix darf nicht **"** enthalten commands.moderation.prefix.help.description = Legt den Guild-Prefix fest. commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert -commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild aktiviert. +commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Erkennung für Einladungslinks auf diesem Server aktiviert. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert -commands.moderation.invitedetect.activate.error.description = Die Einladungs-Link-Erkennung ist bereits auf dieser Guild aktiviert. +commands.moderation.invitedetect.activate.error.description = Die Erkennung für Einladungslinks ist bereits auf diesem Server aktiviert. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert -commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild deaktiviert. +commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Erkennung für Einladungslinks auf diesem Server deaktiviert. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = Die Einladungslink-Erkennung ist auf dieser Guild bereits deaktiviert. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. @@ -178,7 +178,7 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Tretet deinem Sprachkanal bei. +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.tile = Nicht verbunden @@ -186,7 +186,7 @@ commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal a 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 = spielt jetzt +commands.music.play.success.loading.title = Jetzt läuft commands.music.play.success.title = Titel commands.music.play.success.author = Autor commands.music.play.success.length = Länge From 924309a5de1b48b4e5e7b0fa4d97fe2fc455fd28 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 00:10:30 +0100 Subject: [PATCH 21/97] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 151f946..2608d85 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -186,15 +186,15 @@ commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal a 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 = Jetzt läuft +commands.music.play.success.loading.title = %extra% Jetzt läuft %extra% commands.music.play.success.title = Titel commands.music.play.success.author = Autor commands.music.play.success.length = Länge commands.music.play.success.tracks = Tracks -commands.music.play.error.load.title = Laden fehlgeschlagen +commands.music.play.error.load.title = %extra% Laden fehlgeschlagen %extra% commands.music.play.error.load.description = Leider kann ich das angegebene Lied nicht laden commands.music.play.error.match.title = %extra% No matches %extra% -commands.music.play.error.match.description = Ich kann keinen Song mit dem Namen auf YouTube finden +commands.music.play.error.match.description = Ich kann keinen Song mit diesem Namen auf YouTube finden commands.music.play.help.description = Spielt den angegebenen Song ab. commands.music.stop.success.title = Erfolgreich gestoppt commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. From ba46d948ccbc55a10b9503b91fbfa70bbfc6b69e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 4 Jan 2020 13:58:55 +0100 Subject: [PATCH 22/97] Perm error msg --- src/main/java/com/bbn/hadder/Hadder.java | 2 + .../hadder/commands/music/JoinCommand.java | 45 ++++++++++++------- .../Translations/Translations_en.properties | 2 + 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 85ca64f..30e53a0 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -11,6 +11,7 @@ import com.bbn.hadder.commands.settings.*; import com.bbn.hadder.commands.music.*; 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.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; @@ -39,6 +40,7 @@ public class Hadder { builder.setAutoReconnect(true); builder.setShardsTotal(1); builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork")); + builder.setStatus(OnlineStatus.DO_NOT_DISTURB); builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index ceafccd..acce3c6 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.VoiceChannel; +import net.dv8tion.jda.api.exceptions.InsufficientPermissionException; import net.dv8tion.jda.api.managers.AudioManager; /* @@ -20,15 +21,22 @@ public class JoinCommand implements Command { VoiceChannel vc = event.getMember().getVoiceState().getChannel(); if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { - event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.join.success.title", - "", - "commands.music.join.success.description", - vc.getName()) - .build()).queue(); + try { + event.getGuild().getAudioManager().openAudioConnection(vc); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.join.success.title", + "", + "commands.music.join.success.description", + vc.getName()) + .build()).queue(); + } catch (InsufficientPermissionException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.join.error.permission.title", + "commands.music.join.error.permission.description") + .build()).queue(); + } } else { event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( @@ -38,12 +46,19 @@ public class JoinCommand implements Command { .build()).queue(); } } else { - event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.join.success.title", "", - "commands.music.join.success.description", vc.getName()) - .build()).queue(); + try { + event.getGuild().getAudioManager().openAudioConnection(vc); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.join.success.title", "", + "commands.music.join.success.description", vc.getName()) + .build()).queue(); + } catch (InsufficientPermissionException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.join.error.permission.title", + "commands.music.join.error.permission.description") + .build()).queue(); + } } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 650848b..c054233 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -178,6 +178,8 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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 From 7a09a2b1bc43d1b79a2fd080d1a9a29b36bfa751 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 4 Jan 2020 14:39:02 +0100 Subject: [PATCH 23/97] More error messages --- .../hadder/commands/music/LeaveCommand.java | 23 ++++++++---- .../hadder/commands/music/SkipCommand.java | 14 +++++-- .../hadder/commands/music/StopCommand.java | 21 +++++++---- .../hadder/commands/music/VolumeCommand.java | 37 +++++++++++-------- .../Translations/Translations_en.properties | 12 +++++- 5 files changed, 71 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index ec9043c..8636984 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -13,17 +13,24 @@ public class LeaveCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { - event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.leave.success.title", - "commands.music.leave.success.description") - .build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getGuild().getAudioManager().closeAudioConnection(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.leave.success.title", + "commands.music.leave.success.description") + .build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.leave.error.channel.title", + "commands.music.leave.error.channel.description") + .build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, - "commands.music.leave.error.tile", - "commands.music.leave.error.description") + "commands.music.leave.error.connected.tile", + "commands.music.leave.error.connected.description") .build()).queue(); } } 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 c2265bd..40f366f 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -13,10 +13,16 @@ public class SkipCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) { - event.getAudioManager().forceSkipTrack(event); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.skip.success.title", - "commands.music.skip.success.description").build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getAudioManager().forceSkipTrack(event); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.skip.success.title", + "commands.music.skip.success.description").build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.skip.error.connected.title", + "commands.music.skip.error.connected.description ").build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.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 b9336bc..56cd891 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -13,13 +13,20 @@ public class StopCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - event.getAudioManager().players.remove(event.getGuild().getId()); - event.getAudioManager().getPlayer(event.getGuild()).destroy(); - event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue(); - event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.stop.success.title", - "commands.music.stop.success.description").build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getAudioManager().players.remove(event.getGuild().getId()); + event.getAudioManager().getPlayer(event.getGuild()).destroy(); + event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue(); + event.getGuild().getAudioManager().closeAudioConnection(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.stop.success.title", + "commands.music.stop.success.description").build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.stop.error.connected.title", + "commands.music.stop.error.connected.description") + .build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index d0d058b..a7d3546 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -14,22 +14,29 @@ public class VolumeCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length > 0) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - try { - int volume = Integer.parseInt(args[0]); - if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) { - event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.volume.success.title", "", - "commands.music.volume.success.description", String.valueOf(volume)).build()).queue(); - } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, - "commands.music.volume.error.int.title", - "commands.music.volume.error.int.description").build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + try { + int volume = Integer.parseInt(args[0]); + if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) { + event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.volume.success.title", "", + "commands.music.volume.success.description", String.valueOf(volume)).build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.volume.error.int.title", + "commands.music.volume.error.int.description").build()).queue(); + } + } catch (NumberFormatException e) { + event.getHelpCommand().sendHelp(this, event); + } catch (Exception e) { + e.printStackTrace(); } - } catch (NumberFormatException e) { - event.getHelpCommand().sendHelp(this, event); - } catch (Exception e) { - e.printStackTrace(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.volume.error.connected.title", + "commands.volume.stop.error.connected.description") + .build()).queue(); } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index c054233..50da52a 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -183,8 +183,10 @@ commands.music.join.error.permission.description = I am not allowed to join your 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -200,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -212,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From e2ebdf20a9eba5b8208d412427219f2621c22710 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 4 Jan 2020 14:42:09 +0100 Subject: [PATCH 24/97] #300 --- .../java/com/bbn/hadder/commands/music/PlayCommand.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 299d222..55808e1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.exceptions.InsufficientPermissionException; import java.net.URL; @@ -24,6 +25,11 @@ public class PlayCommand implements Command { "commands.music.play.load.title", "⭕", "commands.music.play.load.description", "").build()).complete(); event.getAudioManager().loadTrack(input, event, msg); + } catch (InsufficientPermissionException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.join.error.permission.title", + "commands.music.join.error.permission.description") + .build()).queue(); } catch (Exception ignore) { Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.load.title", "⭕", From c522fd176964658b76149e67a1efa9c5616e8325 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:55 +0100 Subject: [PATCH 25/97] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 2608d85..264e6b7 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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 = 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.tile = Nicht verbunden -commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild +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 = Nicht verbunden +commands.music.leave.error.connected.description = Ich bin derzeit in keinem Sprachkanal auf dieser 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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = Ich kann keinen Song mit diesem Na commands.music.play.help.description = Spielt den angegebenen Song ab. commands.music.stop.success.title = Erfolgreich gestoppt commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stoppt den Song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Erfolgreich übersprungen commands.music.skip.success.description = Ich habe erfolgreich zum nächsten Song übersprungen +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Überspringt den gerade abgespielten Song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier From a0be7a635bc661eaa6276df24cbac2513765d289 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:56 +0100 Subject: [PATCH 26/97] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From 0fa5160c57e4dd7612f3f9cabda65874d413afcc Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:57 +0100 Subject: [PATCH 27/97] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From 533e54db438d169ce707d5b3b5300fc0d7072466 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:59 +0100 Subject: [PATCH 28/97] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From 7be9777fb303ce33ccee3475962f0a6a1106a39a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:00 +0100 Subject: [PATCH 29/97] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From 7e05b76ea78b059fef5eed40d6322a73e316f736 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:01 +0100 Subject: [PATCH 30/97] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From ece9abb8176d9f56488063df091e769004c02637 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:03 +0100 Subject: [PATCH 31/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel 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.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +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... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here From 16f1dd8e5f8f7d433b141b0da6820ad4af5cf30a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 5 Jan 2020 01:04:10 +0100 Subject: [PATCH 32/97] Just for fun --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a443484 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,2 @@ +FROM debian:latest +WORKDIR /home/Hadder From 78dfaa6f7b34f942178f19cee6894d032e1379f1 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 5 Jan 2020 01:36:16 +0100 Subject: [PATCH 33/97] Pause Command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/music/PauseCommand.java | 61 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/PauseCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 30e53a0..f257042 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -101,7 +101,8 @@ public class Hadder { new EditRulesCommand(), new VolumeCommand(), new StopCommand(), - new BlacklistCommand()), config, helpCommand); + new BlacklistCommand(), + new PauseCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java new file mode 100644 index 0000000..f67a099 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java @@ -0,0 +1,61 @@ +package com.bbn.hadder.commands.music; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; + +public class PauseCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + if (!event.getAudioManager().getPlayer(event.getGuild()).isPaused()) { + event.getAudioManager().getPlayer(event.getGuild()).setPaused(true); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.pause.success.title", + "commands.music.pause.success.description") + .build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.pause.error.paused.title", + "commands.music.pause.error.paused.description") + .build()).queue(); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.pause.error.connected.title", + "commands.music.pause.error.connected.description") + .build()).queue(); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.info.error.title", + "commands.music.info.error.description").build()).queue(); + } + } + + @Override + public String[] labels() { + return new String[]{"pause"}; + } + + @Override + public String description() { + return "commands.music.pause.help.description"; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } +} From 3af62f2f25fcc88d5eb5d76b1eb7f3c83a184e58 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 5 Jan 2020 01:36:26 +0100 Subject: [PATCH 34/97] Unpause feature --- .../com/bbn/hadder/commands/music/PlayCommand.java | 13 +++++++++++++ .../Translations/Translations_en.properties | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 55808e1..1646769 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -43,6 +43,19 @@ public class PlayCommand implements Command { "commands.music.join.error.channel.description") .build()).queue(); } + } else if (event.getAudioManager().getPlayer(event.getGuild()).isPaused()) { + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getAudioManager().getPlayer(event.getGuild()).setPaused(false); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.success.unpause.title", + "commands.music.play.success.unpause.description") + .build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.play.error.connected.title", + "commands.music.play.error.connected.description") + .build()).queue(); + } } else event.getHelpCommand().sendHelp(this, event); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From f9b5d1d15a687c164382359331325ac02d11ebb4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:04 +0100 Subject: [PATCH 35/97] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 264e6b7..c269bfa 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Laden fehlgeschlagen %extra% commands.music.play.error.load.description = Leider kann ich das angegebene Lied nicht laden commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = Ich kann keinen Song mit diesem Namen auf YouTube finden +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Spielt den angegebenen Song ab. commands.music.stop.success.title = Erfolgreich gestoppt commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier From c4f3f59b6f0ef11c1ca81ee8034fe2edc002305e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:05 +0100 Subject: [PATCH 36/97] New translations Translations_en.properties (English) New English translation --- .../resources/Translations/Translations_en.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 785b895d614f723e834f1b19c808f1fefd947740 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:07 +0100 Subject: [PATCH 37/97] New translations Translations_en.properties (Spanish) New Spanish translation --- .../resources/Translations/Translations_es.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From c4835f5981d0de0898f34831450457c482532f35 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:08 +0100 Subject: [PATCH 38/97] New translations Translations_en.properties (French) New French translation --- .../resources/Translations/Translations_fr.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 9e75a2db7a93d7a3c8e1b55fe984d247f90b18ad Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:09 +0100 Subject: [PATCH 39/97] New translations Translations_en.properties (Russian) New Russian translation --- .../resources/Translations/Translations_ru.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 738e593b53c45f014c5732874366c90c731a9b24 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:11 +0100 Subject: [PATCH 40/97] New translations Translations_en.properties (Turkish) New Turkish translation --- .../resources/Translations/Translations_tr.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From d13b38f572fec7263e8c8b17a491576a0e0f6f0a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:12 +0100 Subject: [PATCH 41/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../resources/Translations/Translations_zh.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. 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.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. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 266bbef903034f60d43e23e4dc8213afff603f17 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:21:58 +0000 Subject: [PATCH 42/97] Bump lavaplayer from 1.3.32 to 1.3.33 Bumps lavaplayer from 1.3.32 to 1.3.33. 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 712e13f..baf5300 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ com.sedmelluq lavaplayer - 1.3.32 + 1.3.33 From e51f2c84697af975a8fb1dd9d60fcc2c156521d9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:22:20 +0000 Subject: [PATCH 43/97] Bump JDA from 4.1.0_93 to 4.1.0_95 Bumps JDA from 4.1.0_93 to 4.1.0_95. 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 712e13f..3b0c4f9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ net.dv8tion JDA - 4.1.0_93 + 4.1.0_95 org.json From b79e1fbf740eeb047b96100191520c027e4f73aa Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 16:04:56 +0100 Subject: [PATCH 44/97] Codacy --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a443484..bad7422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM debian:latest +FROM debian:buster WORKDIR /home/Hadder From 305e17568fe7dce72169f4f1676c93fe3454b57f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:21:49 +0100 Subject: [PATCH 45/97] Introducing loop command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/music/LoopCommand.java | 36 +++++++++++++++++++ .../Translations/Translations_en.properties | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/LoopCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index f257042..b4a6cbb 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -102,7 +102,8 @@ public class Hadder { new VolumeCommand(), new StopCommand(), new BlacklistCommand(), - new PauseCommand()), config, helpCommand); + new PauseCommand(), + new LoopCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java new file mode 100644 index 0000000..014d3b4 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -0,0 +1,36 @@ +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; + +/** + * @author Skidder / GregTCLTK + */ + +public class LoopCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + + } + + @Override + public String[] labels() { + return new String[]{"loop", "repeat"}; + } + + @Override + public String description() { + return "commands.music.loop.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 edd9925..8ae39ff 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,7 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From c687cef65da0e299303b4517cec019c31c7bd7e3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:26:59 +0100 Subject: [PATCH 46/97] Error messages --- .../bbn/hadder/commands/music/LoopCommand.java | 16 +++++++++++++++- .../Translations/Translations_en.properties | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index 014d3b4..a47b7a3 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -2,6 +2,7 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; /** * @author Skidder / GregTCLTK @@ -11,7 +12,20 @@ public class LoopCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - + if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.loop.error.connected.title", + "commands.music.loop.error.connected.description") + .build()).queue(); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.info.error.title", + "commands.music.info.error.description").build()).queue(); + } } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 8ae39ff..a7a3a61 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,8 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here From 4198f1e24580a99b870438de626fe24d4a806b5e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:38:02 +0100 Subject: [PATCH 47/97] Loop function --- .../java/com/bbn/hadder/audio/TrackManager.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index b4c1e9a..bb95194 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -19,6 +19,8 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final Queue queue; + private boolean loop = false; + AudioTrack lastTrack; public TrackManager(AudioPlayer player) { this.player = player; @@ -48,7 +50,9 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { Guild g = queue.poll().getAuthor().getGuild(); - if (queue.isEmpty()) { + if (loop) { + player.startTrack(lastTrack.makeClone(), false); + } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { player.playTrack(queue.element().getTrack()); @@ -67,6 +71,16 @@ public class TrackManager extends AudioEventAdapter { queue.remove(entry); } + public boolean isLoop() + { + return loop; + } + + public void setLoop(boolean repeating) + { + this.loop = repeating; + } + public AudioInfo getTrackInfo(AudioTrack track) { return queue.stream().filter(audioInfo -> audioInfo.getTrack().equals(track)).findFirst().orElse(null); } From fb0ef99d8384c9d26da56789caf5ef1c559f88e2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:40:03 +0100 Subject: [PATCH 48/97] Integrate the loop function --- .../java/com/bbn/hadder/commands/music/LoopCommand.java | 8 +++++++- .../resources/Translations/Translations_en.properties | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index a47b7a3..86ae1f1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -14,7 +14,13 @@ public class LoopCommand implements Command { public void executed(String[] args, CommandEvent event) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - + if (event.getAudioManager().getTrackManager(event.getGuild()).isLoop()) { + event.getAudioManager().getTrackManager(event.getGuild()).setLoop(false); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); + } else { + event.getAudioManager().getTrackManager(event.getGuild()).setLoop(true); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.loop.error.connected.title", diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index a7a3a61..6e2760e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,10 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. commands.music.loop.error.connected.title = No channel commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. commands.music.loop.help.description = Repeats a song/queue. From 93d5acda5d7de2c8c36f8dc02fbdbb6f55c2eac7 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:43:20 +0100 Subject: [PATCH 49/97] Switch --- src/main/java/com/bbn/hadder/commands/music/LoopCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index 86ae1f1..5003134 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -16,10 +16,10 @@ public class LoopCommand implements Command { if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { if (event.getAudioManager().getTrackManager(event.getGuild()).isLoop()) { event.getAudioManager().getTrackManager(event.getGuild()).setLoop(false); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); } else { event.getAudioManager().getTrackManager(event.getGuild()).setLoop(true); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, From 8b855b267663fb713df81479094ade9cb9f5ea20 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 21:11:01 +0100 Subject: [PATCH 50/97] Some stuff --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index bb95194..2c76914 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -49,9 +49,10 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { + this.lastTrack = track; Guild g = queue.poll().getAuthor().getGuild(); if (loop) { - player.startTrack(lastTrack.makeClone(), false); + player.playTrack(lastTrack.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { From c82daf0fba92b09a5cc0713e7211f127cd17141f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 7 Jan 2020 16:41:13 +0100 Subject: [PATCH 51/97] /voice --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 2c76914..d24ea3e 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -52,7 +52,7 @@ public class TrackManager extends AudioEventAdapter { this.lastTrack = track; Guild g = queue.poll().getAuthor().getGuild(); if (loop) { - player.playTrack(lastTrack.makeClone()); + player.playTrack(this.lastTrack.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { From 762a383ace8982bcbca77a037aae02ee8976d663 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:05 +0100 Subject: [PATCH 52/97] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index c269bfa..bdd918a 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Kanal konnte nicht gefunden werd commands.moderation.rules.channel.error.description = Ich kann den angegebenen Kanal nicht finden. Bitte starte das Setup erneut. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = Der Kanal wurde erfolgreich auf %extra% gesetzt. Bitte senden Sie mir jetzt die Regeln. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Rolle existiert nicht commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Zeigt Informationen über das abgespielte Lied. commands.music.queue.error.title = Keine Warteschlange commands.music.queue.error.description = Momentan sind keine Lieder in der Warteschlange -commands.music.queue.success.title = Warteschlange +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Erfolgreich übersprungen From 3fc63b57d955ce120aedf1dfc6038a3c1349e7a0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:06 +0100 Subject: [PATCH 53/97] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped From e56c2d94ebacada792a99c41330f789b6ca9bd54 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:08 +0100 Subject: [PATCH 54/97] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped From b9379a2ab49db9d2758944d26325dcd8e964b3be Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:09 +0100 Subject: [PATCH 55/97] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped From 5a5644988620a3b85ce86309735e5376472b45b8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:10 +0100 Subject: [PATCH 56/97] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped From bfd2888ad896664c402904b99a9ea7a20d5cab44 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:12 +0100 Subject: [PATCH 57/97] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped From 0f558eb3170db326dda8714ce2e8716a1702c543 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:13 +0100 Subject: [PATCH 58/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped From c559c9cb569fb6e12d33a9ec6cffea5ec1847103 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 9 Jan 2020 16:55:05 +0100 Subject: [PATCH 59/97] Best commit ;) --- pom.xml | 10 +++++----- src/main/java/com/bbn/hadder/Rethink.java | 5 ++++- src/main/java/com/bbn/hadder/audio/TrackManager.java | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1dfff84..23010ad 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,11 @@ json 20190722 - - com.rethinkdb - rethinkdb-driver - 2.3.3 - + + com.rethinkdb + rethinkdb-driver + 2.3.3 + org.slf4j slf4j-simple diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 6ef9d10..53b7116 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -133,7 +133,10 @@ public class Rethink { } public void insertUser(String id) { - this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en").with("blacklisted", "none")); + this.insert("user", r.hashMap("id", id) + .with("prefix", "h.") + .with("language", "en") + .with("blacklisted", "none")); } public void setBlackListed(String id, String commands) { diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index d24ea3e..ed3e93b 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -52,6 +52,7 @@ public class TrackManager extends AudioEventAdapter { this.lastTrack = track; Guild g = queue.poll().getAuthor().getGuild(); if (loop) { + player.playTrack(this.lastTrack.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); From 78e67fea3132b9a363b73abcbc1635cc71a111d2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 9 Jan 2020 16:58:38 +0100 Subject: [PATCH 60/97] New Rethink functions --- src/main/java/com/bbn/hadder/Rethink.java | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 53b7116..5ff7c94 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -70,6 +70,22 @@ public class Rethink { } } + public void update(String table, String value, String what, int whatvalue) { + try { + r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + } catch (ClassCastException e) { + e.printStackTrace(); + } + } + + public void update(String table, String value, String what, boolean whatvalue) { + try { + r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + } catch (ClassCastException e) { + e.printStackTrace(); + } + } + public void insert(String table, Object object) { try { r.table(table).insert(object).run(conn); @@ -122,7 +138,8 @@ public class Rethink { } public void insertGuild(String id) { - this.insert("server", r.hashMap("id", id) + this.insert("server", r + .hashMap("id", id) .with("prefix", "h.") .with("message_id", "") .with("role_id", "") @@ -133,7 +150,8 @@ public class Rethink { } public void insertUser(String id) { - this.insert("user", r.hashMap("id", id) + this.insert("user", r + .hashMap("id", id) .with("prefix", "h.") .with("language", "en") .with("blacklisted", "none")); @@ -207,11 +225,7 @@ public class Rethink { } public void setInviteDetection(String guild_id, boolean b) { - try { - r.table("server").get(guild_id).update(r.hashMap("invite_detect", b)).run(conn); - } catch (ClassCastException e) { - e.printStackTrace(); - } + this.update("server", guild_id, "invite_detect", b); } public Boolean getInviteDetection(String guild_id) { From 29c491fae9a5022a3d27f68ee0aec2cdd268f3c8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2020 13:42:45 +0000 Subject: [PATCH 61/97] Bump discord-webhooks from 0.1.8 to 0.2.0 Bumps discord-webhooks from 0.1.8 to 0.2.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 23010ad..6926c73 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ club.minnced discord-webhooks - 0.1.8 + 0.2.0 org.kohsuke From 3de4153c873c33e06c011520ea435ff1b5658d21 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 10 Jan 2020 19:26:03 +0100 Subject: [PATCH 62/97] Loop command fix --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index ed3e93b..489c12f 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -20,7 +20,6 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final Queue queue; private boolean loop = false; - AudioTrack lastTrack; public TrackManager(AudioPlayer player) { this.player = player; @@ -49,11 +48,9 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - this.lastTrack = track; - Guild g = queue.poll().getAuthor().getGuild(); + Guild g = queue.element().getAuthor().getGuild(); if (loop) { - - player.playTrack(this.lastTrack.makeClone()); + player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { From b76b1793d3a408d173eff2c674db8032b331f29a Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:02 +0100 Subject: [PATCH 63/97] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index bdd918a..862eb82 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Erfolgreich aktiviert +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Erfolgreich deaktiviert +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier From 32c58155bf7e38c188308b3f5be124b3b20d890a Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:04 +0100 Subject: [PATCH 64/97] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index f5dd88b..a3a2891 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 5d43b6f6e0100727c871e66f2ef9ff4f1afa24ab Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:05 +0100 Subject: [PATCH 65/97] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index f5dd88b..a3a2891 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From dc697f6ed5152f9c3c6cdc876c93271a9e02aa6f Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:07 +0100 Subject: [PATCH 66/97] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index f5dd88b..a3a2891 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 44d5a37026fd1a42f8dbd11b27da22436b8aa204 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:08 +0100 Subject: [PATCH 67/97] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index f5dd88b..a3a2891 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From ce10b5407fcf9fbdec962ae1db5bb845c8ef8d2d Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:10 +0100 Subject: [PATCH 68/97] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index f5dd88b..a3a2891 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 7ece888c64699d577044637d46a46f6b234c9f81 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 10 Jan 2020 19:31:11 +0100 Subject: [PATCH 69/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index f5dd88b..a3a2891 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -237,6 +237,13 @@ commands.music.pause.error.paused.description = The song is already paused. 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. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 3a8ee9fee093eb826336b74aacb3b0507e1c35e1 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 11 Jan 2020 11:02:15 +0100 Subject: [PATCH 70/97] Help message fix --- src/main/java/com/bbn/hadder/commands/general/HelpCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 8da4db5..7322465 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -59,7 +59,7 @@ public class HelpCommand implements Command { public void sendHelp(Command cmd, CommandEvent event) { if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - String name = labels()[0]; + String name = cmd.labels()[0]; StringBuilder b = new StringBuilder(); b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(event.getMessageEditor().getTerm(cmd.description())).append("\n"); if (cmd.usage() != null) { From 85f456cd075e3557ab6145a34d740b2ebf6b8afb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 11 Jan 2020 12:29:59 +0100 Subject: [PATCH 71/97] :thinking: --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 489c12f..08a1363 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,7 +48,7 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - Guild g = queue.element().getAuthor().getGuild(); + Guild g = queue.poll().getAuthor().getGuild(); if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { From 8f1813dbe268ead2917c451265493e3976b9a249 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 11 Jan 2020 18:24:57 +0100 Subject: [PATCH 72/97] ? --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 08a1363..91fa146 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -48,13 +48,13 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - Guild g = queue.poll().getAuthor().getGuild(); + Guild g = queue.element().getAuthor().getGuild(); if (loop) { player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { - player.playTrack(queue.element().getTrack()); + player.playTrack(queue.element().getTrack().makeClone()); } } From 3c39c70f43a92c49cf6fc040f51e1f8f8f843747 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 11 Jan 2020 18:26:36 +0100 Subject: [PATCH 73/97] =?UTF-8?q?Remove=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bbn/hadder/commands/moderation/RoleCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index b5049ec..47842e8 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -36,7 +36,7 @@ public class RoleCommand implements Command { event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.role.add.success.title", - "✅", + "", "", "commands.moderation.role.add.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 6e2760e..25d8c0d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From 9067f4ebab00a77df15ab4ec765a8319bf45b24a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:00 +0100 Subject: [PATCH 74/97] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 862eb82..eba82b7 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = Alle Regionen commands.moderation.regionchange.success.title = Region erfolgreich gesetzt commands.moderation.regionchange.success.description = Ich habe die neue Serverregion erfolgreich zu %extra% geändert. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = Rolle(n) Erfolgreich hinzugefügt +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = Ich habe %extra% Rollen zu %extra_two% Mitgliedern hinzugefügt. -commands.moderation.role.remove.success.title = Rolle(n) erfolgreich entfernt +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = Ich habe %extra% Rollen von %extra_two% Mitgliedern entfernt. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From 0b2016598623b741cdfcc6a6bdacddc85b477e9a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:01 +0100 Subject: [PATCH 75/97] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index a3a2891..fe25ac6 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From 7f5dda93fc75a3b4f2328f15c32eab1c397d9d87 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:03 +0100 Subject: [PATCH 76/97] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index a3a2891..fe25ac6 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From f232803c73ad408b8379ad0c71c2365e45194009 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:04 +0100 Subject: [PATCH 77/97] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index a3a2891..fe25ac6 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From d7d118b1e23fe56140223dfa13777fc39ff54fbb Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:05 +0100 Subject: [PATCH 78/97] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index a3a2891..fe25ac6 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From ad47502c73bdb50f7b1c8bdecb7509c3ac1a13b2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:07 +0100 Subject: [PATCH 79/97] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index a3a2891..fe25ac6 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From 67f440e357e4ce9b333738fcfc0b3e712d773c60 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 11 Jan 2020 19:11:08 +0100 Subject: [PATCH 80/97] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index a3a2891..fe25ac6 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -121,9 +121,9 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.title = Successfully added role(s) commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.title = Successfully removed role(s) commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) commands.moderation.rules.setup.title = Set up rules From e4aad8b597950e92fb702a27c56f7b0cbc8497af Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 12 Jan 2020 01:08:38 +0100 Subject: [PATCH 81/97] Not needed stuff --- src/main/java/com/bbn/hadder/Rethink.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 5ff7c94..f51814e 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -62,25 +62,25 @@ public class Rethink { else return null; } - public void update(String table, String value, String what, String whatvalue) { + public void update(String table, String where, String what, String value) { try { - r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + r.table(table).get(where).update(r.hashMap(what, value)).run(conn); } catch (ClassCastException e) { e.printStackTrace(); } } - public void update(String table, String value, String what, int whatvalue) { + public void update(String table, String where, String what, int value) { try { - r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + r.table(table).get(where).update(r.hashMap(what, value)).run(conn); } catch (ClassCastException e) { e.printStackTrace(); } } - public void update(String table, String value, String what, boolean whatvalue) { + public void update(String table, String where, String what, boolean value) { try { - r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + r.table(table).get(where).update(r.hashMap(what, value)).run(conn); } catch (ClassCastException e) { e.printStackTrace(); } From 0a7176a758fb26becba69ca2ed42dcc412ff99b5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 13 Jan 2020 08:59:45 +0100 Subject: [PATCH 82/97] Update JDA version --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 6926c73..f40ca41 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,19 @@ 1.13 + + + jcenter + jcenter-bintray + https://jcenter.bintray.com + + + net.dv8tion JDA - 4.1.0_95 + 4.1.0_96 org.json @@ -53,14 +61,6 @@ - - - jcenter - jcenter-bintray - https://jcenter.bintray.com - - - From c8833f5bb9b572b59732d7ecde56395c3c3466e4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 13 Jan 2020 16:40:46 +0100 Subject: [PATCH 83/97] 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 eba82b7..a14cff2 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -176,7 +176,7 @@ commands.music.join.error.connecting.already.title = Already connected commands.music.join.error.connecting.already.description = I am already connected to your voice channel commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment -commands.music.join.error.channel.title = No Voice Channel +commands.music.join.error.channel.title = Kein Sprachkanal 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. From 5ee7157e9ae67dca25ce2c96c304b9b4edad4589 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 13 Jan 2020 16:50:42 +0100 Subject: [PATCH 84/97] 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 a14cff2..850e6f7 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -121,12 +121,12 @@ commands.moderation.regionchange.regions.title = Alle Regionen commands.moderation.regionchange.success.title = Region erfolgreich gesetzt commands.moderation.regionchange.success.description = Ich habe die neue Serverregion erfolgreich zu %extra% geändert. commands.moderation.regionchange.help.description = Changes the server region to locked regions. -commands.moderation.role.add.success.title = Successfully added role(s) +commands.moderation.role.add.success.title = Rolle(n) erfolgreich hinzugefügt commands.moderation.role.add.success.description = Ich habe %extra% Rollen zu %extra_two% Mitgliedern hinzugefügt. -commands.moderation.role.remove.success.title = Successfully removed role(s) +commands.moderation.role.remove.success.title = Rolle(n) erfolgreich entfernt commands.moderation.role.remove.success.description = Ich habe %extra% Rollen von %extra_two% Mitgliedern entfernt. -commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) -commands.moderation.rules.setup.title = Set up rules +commands.moderation.role.help.description = Fügt und entfernt eine oder mehrere Rolle(n) von einem oder mehreren Benutzer(n) hinzu +commands.moderation.rules.setup.title = Richte Regeln ein commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify. commands.moderation.rules.channel.error.title = Kanal konnte nicht gefunden werden commands.moderation.rules.channel.error.description = Ich kann den angegebenen Kanal nicht finden. Bitte starte das Setup erneut. From 3ffadfcafa086f05486ac8d31578578ea2ce92bd Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 13 Jan 2020 17:00:35 +0100 Subject: [PATCH 85/97] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 850e6f7..a86f945 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -171,13 +171,13 @@ commands.moderation.editrules.success.description = I successfully changed the r commands.moderation.editrules.help.description = Edits the rules message. commands.music.join.success.title = Successfully connected -commands.music.join.success.description = I successfully connected to %extra%. +commands.music.join.success.description = Ich habe mich erfolgreich mit %extra% verbunden. commands.music.join.error.connecting.already.title = Already connected -commands.music.join.error.connecting.already.description = I am already connected to your voice channel -commands.music.join.error.connecting.trying.title = Already trying to connect -commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment +commands.music.join.error.connecting.already.description = Ich bin bereits mit deinem Sprachkanal verbunden +commands.music.join.error.connecting.trying.title = Verbindung wird bereits hergestellt +commands.music.join.error.connecting.trying.description = Hadder versucht bereits, sich zu verbinden. Bitte warten Sie einen Moment commands.music.join.error.channel.title = Kein Sprachkanal -commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.channel.description = Du befindest dich nicht in einem Sprachkanal. 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 = Tritt deinem Sprachkanal bei. @@ -226,7 +226,7 @@ commands.music.skip.help.description = Überspringt den gerade abgespielten Song commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.int.description = Die Lautstärke muss zwischen 1 und 200 liegen commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. From 8c6d068770274584cdb2f3b46d2b11b5a8da3fcf Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 13 Jan 2020 19:35:16 +0100 Subject: [PATCH 86/97] stuff --- .github/workflows/maven.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a15e1a2..37a9d61 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,7 +30,7 @@ jobs: uses: garygrossgarten/github-action-scp@release with: local: ./target/Hadder-Build.jar - remote: /home/Bots/Hadder-Build.jar + remote: /home/Hadder-Build.jar host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} @@ -41,7 +41,7 @@ jobs: username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh + script: /home/deploy.sh - name: Send Webhook Notification if: always() env: diff --git a/pom.xml b/pom.xml index f40ca41..79cd707 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ net.dv8tion JDA - 4.1.0_96 + 4.1.0_95 org.json From b39bd971cc6eb304dc89ad8d370d6826262a6b07 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 13 Jan 2020 20:35:24 +0100 Subject: [PATCH 87/97] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 11518a2..d41835c 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,6 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime. Skidder#6775
Hax#6775 -### Designer -TopComp#1288 - ## A few commands | **Command** | **Description** | |----------------|---------------------------------------------------------------| From a9eed621fd2e3b0286be22b6d27d7b4bc930aacf Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 13 Jan 2020 20:40:04 +0100 Subject: [PATCH 88/97] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d41835c..f7a3ccf 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Hax#6775 | h.help | Shows each command and explains its usage. | | h.about | Shows information about Hadder. | | h.equals | Checks if two strings are the same. | -| h.invite | Shows the invitation link to invite Hadder to your server. | +| h.invite | Shows the invite link to invite Hadder to your server. | | h.ping | Shows the ping to the Discord API. | | h.avatar | Sends the avatar of the specified member. | | h.gif | Looks for a GIF on Giphy. | From 067b5b3a4ded8cef7fda9912047329e5cfaeb92b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2020 13:37:05 +0000 Subject: [PATCH 89/97] Bump JDA from 4.1.0_95 to 4.1.0_97 Bumps JDA from 4.1.0_95 to 4.1.0_97. 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 79cd707..569e8aa 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ net.dv8tion JDA - 4.1.0_95 + 4.1.0_97 org.json From 391ef46195f0a514f9c9b13ceffb30954f10e846 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 14 Jan 2020 18:49:04 +0100 Subject: [PATCH 90/97] Better error message in the rules command --- .../bbn/hadder/commands/moderation/RulesCommand.java | 10 ++++++++-- .../resources/Translations/Translations_en.properties | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index fc432c2..48951c5 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -55,7 +55,10 @@ public class RulesCommand implements Command { } }, event.getJDA(), event.getAuthor()); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.moderation.rules.error.permission.title", + "commands.moderation.rules.error.permission.description") + .build()).queue(); } } @@ -221,7 +224,10 @@ public class RulesCommand implements Command { .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.moderation.rules.error.interact.title", + "commands.moderation.rules.error.interact.description") + .build()).queue(); } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From 1b234138f9ce8f7239c8321c906a3c6495ee9516 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:14 +0100 Subject: [PATCH 91/97] 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 a86f945..41eee21 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From 779578291270d85302f23d6b7937e9038caf90ca Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:15 +0100 Subject: [PATCH 92/97] 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 fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From c36911206f3a26d3cc9bc1a2d89bcb0df55cccd8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:16 +0100 Subject: [PATCH 93/97] 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 fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From 10ab3d75d19f240eb01e76d882e8ec52318add11 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:18 +0100 Subject: [PATCH 94/97] 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 fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From 31fcd95da8e41f11ffab71b49b0d6c4c8851c421 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:20 +0100 Subject: [PATCH 95/97] 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 fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From c84fdc3f4a74c3d82e9b27330e0eedc3d474a2f4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:21 +0100 Subject: [PATCH 96/97] 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 fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel. From aad650f31aac1d8583caecf24c77508a05703d1e Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 14 Jan 2020 21:01:23 +0100 Subject: [PATCH 97/97] 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 fe25ac6..9167e2d 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -153,6 +153,10 @@ commands.moderation.rules.success.title = Successfully set the rules commands.moderation.rules.success.description = I successfully send the rules in %extra%. commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel +commands.moderation.rules.error.permission.title = No permission +commands.moderation.rules.error.permission.description = To execute this command, I need the `MANAGE_ROLES` permission. +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! commands.moderation.starboard.help.description = Sets the starboard channel.