From 9d34f839e824d724661f5201e36fb65b7b78eb26 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 28 Dec 2019 19:10:29 +0100 Subject: [PATCH 01/41] 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 2483972..2a7d052 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -131,9 +131,9 @@ 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.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.description = I successfully removed %extra% roles from %extra_two% members. +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.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.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. From 6c278984462b50cc271ca89c8e9096f5f34c4ff0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:10 +0100 Subject: [PATCH 02/41] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 2a7d052..2b2ed83 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -44,7 +44,9 @@ 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.field.usage = Benutzung\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Benutzung\:** +commands.general.help.example = **Example\:** 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 2d999cc2e25faefa6c56935222455f73a2b208b3 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:11 +0100 Subject: [PATCH 03/41] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index d8cfb15..4864f77 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example\:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName] From cf2e696da3cfcd409a4235bce7ff48a94da62bd6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:13 +0100 Subject: [PATCH 04/41] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index d8cfb15..4864f77 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example\:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName] From 5577bc0e23913687dd71fdf8c1ce3c5754aa6948 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:14 +0100 Subject: [PATCH 05/41] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index d8cfb15..4864f77 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example\:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName] From 777fb0761eba16ef9e6e5cf595bd0e4988acc263 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:15 +0100 Subject: [PATCH 06/41] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index d8cfb15..4864f77 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example\:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName] From 368a4677c8ed3958acbe6767100a610173e7c7c2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:17 +0100 Subject: [PATCH 07/41] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index d8cfb15..4864f77 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example\:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName] From 3a6870b74b2e53fb2e10b81eb58ba5d45013e0ac Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 30 Dec 2019 19:31:18 +0100 Subject: [PATCH 08/41] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index d8cfb15..4864f77 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description\:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example\:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName] From 2d345c646910e90ec283b7022339b8011bff9d69 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:00:53 +0100 Subject: [PATCH 09/41] 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 2b2ed83..fb3e361 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -70,8 +70,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.description = Die GitHub API könnte im Moment nicht verfügbar sein\! -commands.misc.github.user.error.description = Dieser Benutzer existiert nicht\! +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.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. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Eingabe commands.owner.eval.success.output = Ausgabe commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Führt den angegebenen Code aus -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Erfolgreich verlassen commands.owner.guildleave.success.description = Ich habe %extra% erfolgreich verlassen. commands.owner.guildleave.error.title = Verlassen nicht möglich @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Führt den angegebenen Code aus. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From 1bf00c9e83e32df34f041d771c865d9b8f218130 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:00:54 +0100 Subject: [PATCH 10/41] 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 4864f77..583fc76 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +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.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Input commands.owner.eval.success.output = Output commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Execute the given code -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From e537ce6f3aa0c3dbce20ade0c839bf810f5fb2ca Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:00:55 +0100 Subject: [PATCH 11/41] 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 4864f77..583fc76 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +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.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Input commands.owner.eval.success.output = Output commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Execute the given code -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From b99a458f84fc31b13d0d14a4608e755d8ad4c80b Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:00:57 +0100 Subject: [PATCH 12/41] 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 4864f77..583fc76 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +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.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Input commands.owner.eval.success.output = Output commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Execute the given code -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From d0262a9119524b0575d331787950878dae8877c2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:00:58 +0100 Subject: [PATCH 13/41] 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 4864f77..583fc76 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +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.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Input commands.owner.eval.success.output = Output commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Execute the given code -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From 18bd5f2f53001ebca01926a73f8c20f4843093ab Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:00:59 +0100 Subject: [PATCH 14/41] 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 4864f77..583fc76 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +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.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Input commands.owner.eval.success.output = Output commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Execute the given code -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From 9af336d63ed8b72ba377620bdb489d7d1c1ebc76 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 04:01:01 +0100 Subject: [PATCH 15/41] 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 4864f77..583fc76 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +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.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ commands.owner.eval.success.input = Input commands.owner.eval.success.output = Output commands.owner.eval.success.timing = Timing commands.owner.eval.help.description = Execute the given code -commands.owner.eval.help.usage = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ commands.owner.test.help.description = Just a little Test Command commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. commands.settings.language.help.description = Sets the new primary language for a user. -commands.settings.language.help.usage = commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. From 955e8cc15165819ce28a334d2e5d62d1e0ea6717 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:34 +0100 Subject: [PATCH 16/41] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index fb3e361..27e420e 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@Benutzer> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@Benutzer> -region = -guildid = -content = -song = -user/id= [@Benutzer]/[ID] - error = Fehler none = Nicht angegeben success\! = Erfolgreich\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext commands.moderation.ban.help.description = Bans one or more users from the 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.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. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier From c574adae4411553be55a950c4b82c423a05a8e17 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:35 +0100 Subject: [PATCH 17/41] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 583fc76..08f1e2f 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@User> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@user> -region = -guildid = -content = -song = -user/id= [@User]/[ID] - error = Error none = None success\! = Success\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext 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.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 commands.moderation.clear.success.description.singular = Successfully deleted one message. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 43405fe89fbee4313a142a07588358b0a92781c7 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:36 +0100 Subject: [PATCH 18/41] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 583fc76..08f1e2f 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@User> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@user> -region = -guildid = -content = -song = -user/id= [@User]/[ID] - error = Error none = None success\! = Success\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext 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.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 commands.moderation.clear.success.description.singular = Successfully deleted one message. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From d90f276e0bdbf98d5d876cc9ab8ea2fb5047766d Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:38 +0100 Subject: [PATCH 19/41] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 583fc76..08f1e2f 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@User> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@user> -region = -guildid = -content = -song = -user/id= [@User]/[ID] - error = Error none = None success\! = Success\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext 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.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 commands.moderation.clear.success.description.singular = Successfully deleted one message. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 4d4d250b36106d6fe50c7bc0a0d6fb26b3be543c Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:39 +0100 Subject: [PATCH 20/41] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 583fc76..08f1e2f 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@User> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@user> -region = -guildid = -content = -song = -user/id= [@User]/[ID] - error = Error none = None success\! = Success\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext 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.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 commands.moderation.clear.success.description.singular = Successfully deleted one message. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From d2ef6852628b2b193f44ff0b7b0ce5fba141ed3b Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:40 +0100 Subject: [PATCH 21/41] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 583fc76..08f1e2f 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@User> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@user> -region = -guildid = -content = -song = -user/id= [@User]/[ID] - error = Error none = None success\! = Success\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext 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.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 commands.moderation.clear.success.description.singular = Successfully deleted one message. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 3a9868a0f2dd69586a115809f803b51a374bf9e4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 31 Dec 2019 13:51:42 +0100 Subject: [PATCH 22/41] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 583fc76..08f1e2f 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -4,20 +4,6 @@ Hadder = Hadder -user = <@User> -searchterm = -username = -number = /all -prefix = -userprefix = -vc-name/id = -user+nickname = <@user> -region = -guildid = -content = -song = -user/id= [@User]/[ID] - error = Error none = None success\! = Success\! @@ -97,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext 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.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 commands.moderation.clear.success.description.singular = Successfully deleted one message. @@ -221,6 +208,10 @@ 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.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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From c50176085e23a6efaeaa64a01d3c77bc35768a9e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 13:32:44 +0100 Subject: [PATCH 23/41] Volume command fixes --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b0391b9..6c96512 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -16,7 +16,7 @@ public class VolumeCommand implements Command { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { try { int volume = Integer.parseInt(args[0]); - if (volume < 200 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getId())) { + 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", "", From 5ef680e020c4db2145780cffa5f644af61e68fc0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 13:35:08 +0100 Subject: [PATCH 24/41] Translation fix --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 6c96512..d0d058b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -46,7 +46,7 @@ public class VolumeCommand implements Command { @Override public String description() { - return "Change the volume of the music."; + return "commands.music.volume.help.description"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 133e2e9..7cfb99e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From accb85661aa5c4e69a2fe95a14560f131bbd2757 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 14:32:42 +0100 Subject: [PATCH 25/41] VoiceLeaveListener fix --- src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java index 643a17a..8db4d9f 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -18,7 +18,7 @@ public class VoiceLeaveListener extends ListenerAdapter { @Override public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) { - if (new AudioManager().hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) { + if (audioManager.hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) { audioManager.players.remove(event.getGuild().getId()); audioManager.getPlayer(event.getGuild()).destroy(); audioManager.getTrackManager(event.getGuild()).purgeQueue(); From 6c7445ad3209b9cd49c46ecbf5ccf0648d388b5b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2020 13:46:21 +0000 Subject: [PATCH 26/41] Bump JDA from 4.1.0_88 to 4.1.0_90 Bumps JDA from 4.1.0_88 to 4.1.0_90. 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 920716f..79ee1d3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ net.dv8tion JDA - 4.1.0_88 + 4.1.0_90 org.json From 282ff6c6685a42e55849394d53a98f6f5665aa83 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:20:54 +0100 Subject: [PATCH 27/41] 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 27e420e..6e6e7af 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier From ef4eb4ba13ddcc7aef420cc3248d2b168b71883a Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:20:56 +0100 Subject: [PATCH 28/41] 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 08f1e2f..f142696 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 1283bf8c6b396a1a6c998c177b1c22e9ad82b2c6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:20:57 +0100 Subject: [PATCH 29/41] 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 08f1e2f..f142696 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 62ce8ed52b8aab55be9d2416a456fe167eef5c5b Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:20:59 +0100 Subject: [PATCH 30/41] 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 08f1e2f..f142696 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 382186910b520e25b873c12053b2beed06c2b64b Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:21:00 +0100 Subject: [PATCH 31/41] 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 08f1e2f..f142696 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 03fda46dd77b6ae7e2590038bd7429e563a3ed6d Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:21:01 +0100 Subject: [PATCH 32/41] 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 08f1e2f..f142696 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From ea98a2f9249c53185918fbc27855245e71ff8b01 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 15:21:03 +0100 Subject: [PATCH 33/41] 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 08f1e2f..f142696 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -212,6 +212,7 @@ 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.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here From 51b3e76fb83c266331c6146de8f8062c332de96e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 16:37:58 +0100 Subject: [PATCH 34/41] New bot list --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- ...ckListCommand.java => BlacklistCommand.java} | 15 +++++++-------- src/main/java/com/bbn/hadder/core/Config.java | 4 ++++ src/main/java/com/bbn/hadder/utils/BotList.java | 17 +++++++++++++++++ .../Translations/Translations_en.properties | 1 + 6 files changed, 32 insertions(+), 11 deletions(-) rename src/main/java/com/bbn/hadder/commands/owner/{BlackListCommand.java => BlacklistCommand.java} (94%) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 074bf70..fb55b0d 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -99,7 +99,7 @@ public class Hadder { new EditRulesCommand(), new VolumeCommand(), new StopCommand(), - new BlackListCommand()), config, helpCommand); + new BlacklistCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 436298a..3d84e6a 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -164,8 +164,8 @@ public class Rethink { return !this.get("server", "id", guild_id, "starboard").equals(""); } - public void insertStarboardMessage(String message_id, String guild_id, String starboardmessageid) { - this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboardmessageid)); + public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) { + this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboard_message_id)); } public String getStarboardMessage(String message_id) { diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlackListCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java similarity index 94% rename from src/main/java/com/bbn/hadder/commands/owner/BlackListCommand.java rename to src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index bb9040a..1741edf 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlackListCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -1,15 +1,14 @@ +package com.bbn.hadder.commands.owner; + /* * @author Hax / Hax6775 / Schlauer_Hax */ -package com.bbn.hadder.commands.owner; - import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; @@ -19,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.List; @Perms(Perm.BOT_OWNER) -public class BlackListCommand implements Command { +public class BlacklistCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { @@ -71,7 +70,7 @@ public class BlackListCommand implements Command { if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { String blacklisted = event.getRethink().getBlackListed(user.getId()); if (!blacklisted.equals("none")) { - stringBuilder.append(user.getAsTag() + " (" + user.getId() + ") - " + blacklisted + "\n"); + stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n"); } } } @@ -92,16 +91,16 @@ public class BlackListCommand implements Command { @Override public String description() { - return null; + return "commands.owner.blacklist.help.description"; } @Override public String usage() { - return "add|remove|list Commands @Skidder#6775"; + return "add|remove|list command @User"; } @Override public String example() { - return null; + return "add porn @Skidder"; } } diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index fce590e..6123713 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -143,6 +143,10 @@ public class Config { return config.getJSONObject("Tokens").getString("BotListSpace"); } + public String getDiscordBots2Token() { + return config.getJSONObject("Tokens").getString("DiscordBots2"); + } + public String getClydeName() { return config.getString("Clyde"); } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 6516d13..462f823 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -28,6 +28,7 @@ public class BotList { private static String DiscordBotReviews = "https://discordbotreviews.xyz/api/bot/637002314162372639/stats"; private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats"; private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639"; + private static String DiscordBots2 = "https://discord.bots.gg/api/v1/bots/637002314162372639/stats"; private Config config; @@ -43,6 +44,7 @@ public class BotList { json.put("guilds", Hadder.shardManager.getGuilds().size()); json.put("users", Hadder.shardManager.getUsers().size()); json.put("shard_count", Hadder.shardManager.getShards().size()); + json.put("shardCount", Hadder.shardManager.getShards().size()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString()); @@ -195,6 +197,21 @@ public class BotList { } catch (IOException e) { e.printStackTrace(); } + + // Discord Bots 2 + + Request discordbots2 = new Request.Builder() + .url(DiscordBots2) + .post(body) + .addHeader("Authorization", config.getDiscordBots2Token()) + .build(); + + try { + new OkHttpClient().newCall(discordbots2).execute().close(); + System.out.println("Successfully posted count to discord.bots.gg!"); + } catch (IOException e) { + e.printStackTrace(); + } } } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 7cfb99e..86a4022 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 cce973037818bf599453e3920127db5d77ac7ede Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 16:49:08 +0100 Subject: [PATCH 35/41] Some code improvements again --- example-config.json | 3 ++- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- .../{StarBoardCommand.java => StarboardCommand.java} | 4 ++-- .../bbn/hadder/commands/owner/BlacklistCommand.java | 12 +++++++++--- .../java/com/bbn/hadder/core/CommandHandler.java | 2 +- .../com/bbn/hadder/listener/StarboardListener.java | 4 ++-- .../java/com/bbn/hadder/utils/MessageEditor.java | 4 ++-- 8 files changed, 21 insertions(+), 14 deletions(-) rename src/main/java/com/bbn/hadder/commands/moderation/{StarBoardCommand.java => StarboardCommand.java} (93%) diff --git a/example-config.json b/example-config.json index 437ec97..f787317 100644 --- a/example-config.json +++ b/example-config.json @@ -19,7 +19,8 @@ "DiscordExtremeList": "", "DiscordBotReviews": "", "DiscordBots": "", - "BotListSpace": "" + "BotListSpace": "", + "DiscordBots2": "" }, "Clyde": "" } diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index fb55b0d..85ca64f 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -92,7 +92,7 @@ public class Hadder { new LanguageCommand(), new ClydeCommand(), new PlayCommand(), - new StarBoardCommand(), + new StarboardCommand(), new QueueCommand(), new InfoCommand(), new SkipCommand(), diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 3d84e6a..3bf91a3 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -144,11 +144,11 @@ public class Rethink { return (String) this.get("user", "id", id, "blacklisted"); } - public void setNeededstars(String stars, String guild_id) { + public void setNeededStars(String stars, String guild_id) { this.update("server", guild_id, "neededstars", stars); } - public String getNeededstars(String guild_id) { + public String getNeededStars(String guild_id) { return (String) this.get("server", "id", guild_id, "neededstars"); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java similarity index 93% rename from src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java rename to src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 80d926c..080cd79 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.TextChannel; -public class StarBoardCommand implements Command { +public class StarboardCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { @@ -29,7 +29,7 @@ public class StarBoardCommand implements Command { } if (args.length==2) { - event.getRethink().setNeededstars(args[1], event.getGuild().getId()); + event.getRethink().setNeededStars(args[1], event.getGuild().getId()); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 1741edf..61572c7 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -31,7 +31,7 @@ public class BlacklistCommand implements Command { Member member = event.getMessage().getMentionedMembers().get(0); String blacklisted = event.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); - if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(","))); + if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.addAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); @@ -45,12 +45,13 @@ public class BlacklistCommand implements Command { .build()).queue(); } break; + case "remove": if (args.length == 3) { Member member = event.getMessage().getMentionedMembers().get(0); String blacklisted = event.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); - if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(","))); + if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.removeAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); @@ -64,6 +65,7 @@ public class BlacklistCommand implements Command { .build()).queue(); } break; + case "list": StringBuilder stringBuilder = new StringBuilder(); for (User user : event.getJDA().getUsers()) { @@ -80,6 +82,10 @@ public class BlacklistCommand implements Command { .setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users") .build()).queue(); break; + + default: + event.getHelpCommand().sendHelp(this, event); + break; } } } @@ -101,6 +107,6 @@ public class BlacklistCommand implements Command { @Override public String example() { - return "add porn @Skidder"; + return "add solo @Skidder"; } } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 0a575df..775ad94 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -50,7 +50,7 @@ public class CommandHandler { boolean run = true; String blacklisted = rethink.getBlackListed(event.getAuthor().getId()); - if (!blacklisted.equals("none")) { + if (!"none".equals(blacklisted)) { for (String blacklistedlabel : blacklisted.split(",")) { if (Arrays.asList(cmd.labels()).contains(blacklistedlabel)) { run = false; diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 8bdf694..38c5c52 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -43,7 +43,7 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) { + if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) { event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention()) @@ -77,7 +77,7 @@ public class StarboardListener extends ListenerAdapter { .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) { + if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) { msg2.editMessage(new MessageBuilder() .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention()) .setEmbed( diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 1d39039..4e923ee 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -36,8 +36,8 @@ public class MessageEditor { String description, String description_extra, String description_extra_two) { String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null; EmbedBuilder eb = this.getDefaultSettings(type); - if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); - if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); + if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); + if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); return eb; } From 0d0b8affbc8aa27cd8aa357bb54575e1201442ab Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 16:49:08 +0100 Subject: [PATCH 36/41] Some code improvements again --- example-config.json | 3 ++- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- ...StarBoardCommand.java => StarboardCommand.java} | 4 ++-- .../hadder/commands/owner/BlacklistCommand.java | 14 ++++++++++---- .../java/com/bbn/hadder/core/CommandHandler.java | 2 +- .../com/bbn/hadder/listener/StarboardListener.java | 4 ++-- .../java/com/bbn/hadder/utils/MessageEditor.java | 4 ++-- 8 files changed, 22 insertions(+), 15 deletions(-) rename src/main/java/com/bbn/hadder/commands/moderation/{StarBoardCommand.java => StarboardCommand.java} (93%) diff --git a/example-config.json b/example-config.json index 437ec97..f787317 100644 --- a/example-config.json +++ b/example-config.json @@ -19,7 +19,8 @@ "DiscordExtremeList": "", "DiscordBotReviews": "", "DiscordBots": "", - "BotListSpace": "" + "BotListSpace": "", + "DiscordBots2": "" }, "Clyde": "" } diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index fb55b0d..85ca64f 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -92,7 +92,7 @@ public class Hadder { new LanguageCommand(), new ClydeCommand(), new PlayCommand(), - new StarBoardCommand(), + new StarboardCommand(), new QueueCommand(), new InfoCommand(), new SkipCommand(), diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 3d84e6a..3bf91a3 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -144,11 +144,11 @@ public class Rethink { return (String) this.get("user", "id", id, "blacklisted"); } - public void setNeededstars(String stars, String guild_id) { + public void setNeededStars(String stars, String guild_id) { this.update("server", guild_id, "neededstars", stars); } - public String getNeededstars(String guild_id) { + public String getNeededStars(String guild_id) { return (String) this.get("server", "id", guild_id, "neededstars"); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java similarity index 93% rename from src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java rename to src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 80d926c..080cd79 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.TextChannel; -public class StarBoardCommand implements Command { +public class StarboardCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { @@ -29,7 +29,7 @@ public class StarBoardCommand implements Command { } if (args.length==2) { - event.getRethink().setNeededstars(args[1], event.getGuild().getId()); + event.getRethink().setNeededStars(args[1], event.getGuild().getId()); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 1741edf..5aa61f1 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -31,7 +31,7 @@ public class BlacklistCommand implements Command { Member member = event.getMessage().getMentionedMembers().get(0); String blacklisted = event.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); - if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(","))); + if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.addAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); @@ -45,12 +45,13 @@ public class BlacklistCommand implements Command { .build()).queue(); } break; + case "remove": if (args.length == 3) { Member member = event.getMessage().getMentionedMembers().get(0); String blacklisted = event.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); - if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(","))); + if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.removeAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); @@ -64,12 +65,13 @@ public class BlacklistCommand implements Command { .build()).queue(); } break; + case "list": StringBuilder stringBuilder = new StringBuilder(); for (User user : event.getJDA().getUsers()) { if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { String blacklisted = event.getRethink().getBlackListed(user.getId()); - if (!blacklisted.equals("none")) { + if (!"none".equals(blacklisted)) { stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n"); } } @@ -80,6 +82,10 @@ public class BlacklistCommand implements Command { .setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users") .build()).queue(); break; + + default: + event.getHelpCommand().sendHelp(this, event); + break; } } } @@ -101,6 +107,6 @@ public class BlacklistCommand implements Command { @Override public String example() { - return "add porn @Skidder"; + return "add solo @Skidder"; } } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 0a575df..775ad94 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -50,7 +50,7 @@ public class CommandHandler { boolean run = true; String blacklisted = rethink.getBlackListed(event.getAuthor().getId()); - if (!blacklisted.equals("none")) { + if (!"none".equals(blacklisted)) { for (String blacklistedlabel : blacklisted.split(",")) { if (Arrays.asList(cmd.labels()).contains(blacklistedlabel)) { run = false; diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 8bdf694..38c5c52 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -43,7 +43,7 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) { + if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) { event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention()) @@ -77,7 +77,7 @@ public class StarboardListener extends ListenerAdapter { .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) { + if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) { msg2.editMessage(new MessageBuilder() .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention()) .setEmbed( diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 1d39039..4e923ee 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -36,8 +36,8 @@ public class MessageEditor { String description, String description_extra, String description_extra_two) { String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null; EmbedBuilder eb = this.getDefaultSettings(type); - if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); - if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); + if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); + if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); return eb; } From 815c9bab797680bf9448c602054f72518ca0d719 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 17:47:16 +0100 Subject: [PATCH 37/41] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 20d142d..b7cfdc4 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime. [![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder) [![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues) [![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE) +[![time tracker](https://wakatime.com/badge/github/BigBotNetwork/Hadder.svg)](https://wakatime.com/badge/github/BigBotNetwork/Hadder) [![Discord Extreme List](https://api.discordextremelist.xyz/v1/bot/637002314162372639/widget)](https://discordextremelist.xyz/bots/Hadder) [![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639) From c0489f793ef01c81121834ce8365419842289cb5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 2 Jan 2020 20:39:37 +0100 Subject: [PATCH 38/41] Little spelling fix --- .../com/bbn/hadder/commands/moderation/ClearCommand.java | 4 ++-- src/main/resources/Translations/Translations_en.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 0dbf1da..12d1a58 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -30,9 +30,9 @@ public class ClearCommand implements Command { } Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, - "commands.moderation.lear.all.success.title", + "commands.moderation.clear.all.success.title", "", - "commands.moderation.lear.all.success.description", + "commands.moderation.clear.all.success.description", String.valueOf(msg.size())) .build()).complete(); try { diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 0ca8de0..76ecd48 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 From 872320b3041f076a15cb3faa7e44ccf1259f7a55 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 2 Jan 2020 20:46:17 +0100 Subject: [PATCH 39/41] Starboard help fix --- .../com/bbn/hadder/commands/moderation/StarboardCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 080cd79..d3c97ff 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -40,7 +40,7 @@ public class StarboardCommand implements Command { @Override public String description() { - return "Sets the starboard channel"; + return "commands.moderation.starboard.help.description"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 76ecd48..b499a8e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -153,6 +153,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 From ad598590b65deb29a08d94d500fc7d14b0838d0e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 2 Jan 2020 22:41:04 +0100 Subject: [PATCH 40/41] New bot list --- README.md | 35 +++++++++++++++++++ src/main/java/com/bbn/hadder/core/Config.java | 8 ++--- .../java/com/bbn/hadder/utils/BotList.java | 32 ++++++++--------- .../Translations/Translations_en.properties | 16 ++++----- 4 files changed, 63 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index b7cfdc4..11518a2 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,38 @@ Hax#6775 ### Designer TopComp#1288 + +## A few commands +| **Command** | **Description** | +|----------------|---------------------------------------------------------------| +| 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.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. | +| h.meme | Sends you a random meme. | +| h.clyde | Sends a message as a webhook named Clyde. | +| h.feedback | Sends feedback directly to the developers. | +| h.github | Displays information about a GitHub user profile. | +| h.screenshare | Shows you the link to share your screen. | +| h.ban | Bans one or more users from the server. | +| h.clear | Deletes the specified number of messages. | +| h.prefix | Sets the Guild-Prefix. | +| h.invitedetect | Activate or deactivate the Discord invite link detection. | +| h.kick | Kicks one or more user from the server. | +| h.nick | Rename a one or more user. | +| h.regionchange | Changes the server region to locked regions. | +| h.role | Adds and removes one or more role(s) from one or more user(s) | +| h.rules | Setup the rules on your Discord server | +| h.starboard | Sets the starboard channel. | +| h.editrules | Edits the rules message. | +| h.join | Joins your voice channel. | +| h.leave | Leaves your voice channel. | +| h.play | Plays the specified song. | +| h.stop | Stops the song. | +| h.info | Shows information about the playing song. | +| h.queue | Shows the music queue. | +| h.skip | Skips the currently playing song. | +| h.volume | Change the volume of the music. | diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 6123713..942c382 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -115,10 +115,6 @@ public class Config { return config.getJSONObject("Tokens").getString("DiscordBotList"); } - public String getDiscordBestBotsToken() { - return config.getJSONObject("Tokens").getString("DiscordBestBots"); - } - public String getDiscordBoatsToken() { return config.getJSONObject("Tokens").getString("DiscordBoats"); } @@ -147,6 +143,10 @@ public class Config { return config.getJSONObject("Tokens").getString("DiscordBots2"); } + public String getCloudListToken() { + return config.getJSONObject("Tokens").getString("CloudList"); + } + public String getClydeName() { return config.getString("Clyde"); } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 462f823..6200c4e 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -21,7 +21,6 @@ public class BotList { private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639"; private static String BotsForDiscord = "https://botsfordiscord.com/api/bot/637002314162372639"; private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats"; - private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats"; private static String DiscordBoats = "https://discord.boats/api/bot/637002314162372639"; private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats"; private static String DiscordExtremeList = "https://api.discordextremelist.xyz/v1/bot/637002314162372639"; @@ -29,6 +28,7 @@ public class BotList { private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats"; private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639"; private static String DiscordBots2 = "https://discord.bots.gg/api/v1/bots/637002314162372639/stats"; + private static String CloudList = "https://www.cloudlist.xyz/api/stats/637002314162372639"; private Config config; @@ -93,21 +93,6 @@ public class BotList { e.printStackTrace(); } - // Discord Best Bots - - Request discordbestbots = new Request.Builder() - .url(DiscordBestBots) - .post(body) - .addHeader("Authorization", config.getDiscordBestBotsToken()) - .build(); - - try { - new OkHttpClient().newCall(discordbestbots).execute().close(); - System.out.println("Successfully posted count to Discord Best Bots!"); - } catch (IOException e) { - e.printStackTrace(); - } - // Discord Boats Request discordboats = new Request.Builder() @@ -212,6 +197,21 @@ public class BotList { } catch (IOException e) { e.printStackTrace(); } + + // CloudList + + Request cloudlist = new Request.Builder() + .url(CloudList) + .post(body) + .addHeader("Authorization", config.getCloudListToken()) + .build(); + + try { + new OkHttpClient().newCall(cloudlist).execute().close(); + System.out.println("Successfully posted count to the CloudList!"); + } catch (IOException e) { + e.printStackTrace(); + } } } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index b499a8e..d4f0582 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -153,7 +153,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.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 @@ -176,12 +176,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% @@ -193,22 +193,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 8cb9613fd64e8931dacf88f467c81570462a3f18 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 2 Jan 2020 22:42:28 +0100 Subject: [PATCH 41/41] New JSON String... --- src/main/java/com/bbn/hadder/utils/BotList.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 6200c4e..580a457 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -42,6 +42,7 @@ public class BotList { json.put("server_count", Hadder.shardManager.getGuilds().size()); json.put("guildCount", Hadder.shardManager.getGuilds().size()); json.put("guilds", Hadder.shardManager.getGuilds().size()); + json.put("count", Hadder.shardManager.getGuilds().size()); json.put("users", Hadder.shardManager.getUsers().size()); json.put("shard_count", Hadder.shardManager.getShards().size()); json.put("shardCount", Hadder.shardManager.getShards().size());