From 87b50297b94ff6d390e5250b550d6d91b955016a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 13:14:51 +0000 Subject: [PATCH 01/16] Bump JDA from 4.2.0_194 to 4.2.0_198 Bumps JDA from 4.2.0_194 to 4.2.0_198. 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 fd4e686..f84f712 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_194 + 4.2.0_198 org.json -- 2.45.3 From cab3722e805cef882de794ee6c5ae90bdf5c5e16 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 25 Aug 2020 16:43:00 +0200 Subject: [PATCH 02/16] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index e2a7d45..ca99962 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -23,7 +23,7 @@ success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar von %extra% commands.fun.avatar.error.title = Benutzer nicht gefunden commands.fun.avatar.error.description = Ich kann keinen Benutzer mit dieser ID finden\! -commands.fun.avatar.help.description = Sends the avatar of the specified Member. +commands.fun.avatar.help.description = Sendet den Avatar des angegebenen Mitglieds. commands.fun.gif.error.description = Bitte versuche es mit einem anderen Begriff erneut. commands.fun.gif.help.description = Sucht nach einem GIF auf Giphy. commands.fun.meme.success.title = Dein zufälliges Meme\: -- 2.45.3 From 2c45f584002e8dd07da5997dea8aea9fd3fdff7b Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 25 Aug 2020 17:22:31 +0200 Subject: [PATCH 03/16] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index ca99962..1f826d7 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -23,7 +23,7 @@ success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar von %extra% commands.fun.avatar.error.title = Benutzer nicht gefunden commands.fun.avatar.error.description = Ich kann keinen Benutzer mit dieser ID finden\! -commands.fun.avatar.help.description = Sendet den Avatar des angegebenen Mitglieds. +commands.fun.avatar.help.description = Sendet das Avatar des angegebenen Mitglieds. commands.fun.gif.error.description = Bitte versuche es mit einem anderen Begriff erneut. commands.fun.gif.help.description = Sucht nach einem GIF auf Giphy. commands.fun.meme.success.title = Dein zufälliges Meme\: @@ -172,17 +172,17 @@ commands.moderation.rules.role.description = Die Regeln wurden erfolgreich festg commands.moderation.rules.role.error.title = Rolle existiert nicht commands.moderation.rules.role.error.description = Die angegebene Rolle existiert auf diesem Server nicht. commands.moderation.rules.role.permission.error.title = Keine Berechtigung -commands.moderation.rules.role.permission.error.description = Du kannst diese Rolle nicht auswählen, weil du keinen Zugriff auf sie hast. +commands.moderation.rules.role.permission.error.description = Du kannst diese Rolle nicht auswählen, da du keinen Zugriff auf sie hast. commands.moderation.rules.guild.error.title = Falsche Guild -commands.moderation.rules.guild.error.description = Der erwähnte Kanal muss auf diesem Server sein\! +commands.moderation.rules.guild.error.description = Der angegebene Kanal muss sich auf diesem Server befinden\! commands.moderation.rules.emote.accept.title = Benutzerdefiniertes Zustimmungsemote commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. commands.moderation.rules.emote.decline.title = Benutzerdefiniertes Ablehnungsemote commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.emote.error.access.description = Ich kann auf die benutzerdefinierten Emote(s) nicht zugreifen. -commands.moderation.rules.emote.error.equal.title = Emotes sind gleich +commands.moderation.rules.emote.error.access.description = Ich kann auf benutzerdefinierten Emotes nicht zugreifen. +commands.moderation.rules.emote.error.equal.title = Die Emotes sind gleich commands.moderation.rules.emote.error.equal.description = Die zwei angegebenen Emotes sind gleich. -commands.moderation.rules.emoji.decline.description = Das erste Emote wurde erfolgreich festgelegt. Bitte sende mir jetzt das Ablehnungsemote. +commands.moderation.rules.emoji.decline.description = Das erste Emote wurde erfolgreich festgelegt. Bitte sende mir nun das Ablehnungsemote. commands.moderation.rules.emoji.error.description = Das angegebene Emote kann nicht verwendet werden. commands.moderation.rules.success.title = Regeln erfolgreich festgelegt commands.moderation.rules.success.description = Ich habe die Regeln erfolgreich in %extra% gesendet. -- 2.45.3 From c163bee0763247bc1c4ff4c1d18b4325d2b9d618 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 13:16:43 +0000 Subject: [PATCH 04/16] Bump discord-webhooks from 0.3.2 to 0.4.0 Bumps discord-webhooks from 0.3.2 to 0.4.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f84f712..3cb7f9b 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ club.minnced discord-webhooks - 0.3.2 + 0.4.0 org.kohsuke -- 2.45.3 From 91041260f1584481df8f12b08acb8091ff173762 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 13:17:05 +0000 Subject: [PATCH 05/16] Bump JDA from 4.2.0_198 to 4.2.0_199 Bumps JDA from 4.2.0_198 to 4.2.0_199. 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 f84f712..3a06670 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_198 + 4.2.0_199 org.json -- 2.45.3 From 43b19a6fb59ef59fc35aec0b782a8b8131c4c921 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 13:15:41 +0000 Subject: [PATCH 06/16] Bump JDA from 4.2.0_199 to 4.2.0_200 Bumps JDA from 4.2.0_199 to 4.2.0_200. 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 5a6e86e..4c6bac1 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_199 + 4.2.0_200 org.json -- 2.45.3 From 82bbd93d76dfbf16410dc2409bff066333cbfca5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 13:16:05 +0000 Subject: [PATCH 07/16] Bump discord-webhooks from 0.4.0 to 0.4.1 Bumps discord-webhooks from 0.4.0 to 0.4.1. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a6e86e..bcbd961 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ club.minnced discord-webhooks - 0.4.0 + 0.4.1 org.kohsuke -- 2.45.3 From 6deb57e556ae0925199717711bfd5fa7febc86cf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2020 13:21:14 +0000 Subject: [PATCH 08/16] Bump maven-project-info-reports-plugin from 3.1.0 to 3.1.1 Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases) - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.0...maven-project-info-reports-plugin-3.1.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82951b0..072db60 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ maven-project-info-reports-plugin - 3.1.0 + 3.1.1 -- 2.45.3 From 146648e9d045ef018ea5ce608458bfe60afa0fc8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2020 13:21:39 +0000 Subject: [PATCH 09/16] Bump JDA from 4.2.0_200 to 4.2.0_203 Bumps JDA from 4.2.0_200 to 4.2.0_203. 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 82951b0..7b778a4 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_200 + 4.2.0_203 org.json -- 2.45.3 From 390c5e8425c22e7e995b380504dfedb6bf43b9eb Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 4 Sep 2020 15:33:02 +0200 Subject: [PATCH 10/16] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index de6c92a..1f826d7 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -330,4 +330,4 @@ commands.settings.language.error.description = Please choose one of the followin commands.settings.language.help.description = Führt den angegebenen Code aus. commands.settings.prefix.success.title = Prefix erfolgreich gesetzt commands.settings.prefix.success.description = Ich habe erfolgreich den neuen Prefix für dich auf `%extra% `gesetzt. -commands.settings.prefix.help.description = Legt einen neuen Prefix fest. \ No newline at end of file +commands.settings.prefix.help.description = Legt einen neuen Prefix fest. -- 2.45.3 From 8342df2e05d7571bb3a3045f461c278b2a495a00 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2020 13:15:17 +0000 Subject: [PATCH 11/16] Bump JDA from 4.2.0_203 to 4.2.0_204 Bumps JDA from 4.2.0_203 to 4.2.0_204. 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 fd80b0c..185c8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_203 + 4.2.0_204 org.json -- 2.45.3 From 173e8f1fb0b8df8df1c72ada083aa6a88b614cbd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 19 Sep 2020 01:25:42 +0200 Subject: [PATCH 12/16] Remove unfinished command --- .../moderation/RoleAssignmentCommand.java | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java deleted file mode 100644 index 601b6cf..0000000 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2019-2020 GregTCLTK and Schlauer-Hax - * - * Licensed under the GNU Affero General Public License, Version 3.0; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.gnu.org/licenses/agpl-3.0.en.html - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.bbn.hadder.commands.moderation; - -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.Permission; - -@Perms(Perm.MANAGE_ROLES) -public class RoleAssignmentCommand implements Command { - - @Override - public void executed(String[] args, CommandEvent e) { - //TODO: THIS LOL - if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { - - } else - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); - } - - @Override - public String[] labels() { - return new String[0]; - } - - @Override - public String description() { - return null; - } - - @Override - public String usage() { - return null; - } - - @Override - public String example() { - return null; - } -} -- 2.45.3 From f79ca4162ead2d7f1f03ee7e7c144fac2e47c03e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 19 Sep 2020 21:28:22 +0200 Subject: [PATCH 13/16] Add break; --- .../com/bbn/hadder/commands/moderation/InviteDetectCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index bd1e4cd..99f5f48 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -68,6 +68,7 @@ public class InviteDetectCommand implements Command { break; default: e.getHelpCommand().sendHelp(this, e); + break; } } else e.getHelpCommand().sendHelp(this, e); } -- 2.45.3 From bed9752a9f55ed39e3fab21acae8f5055cd9a29c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 19 Sep 2020 21:28:31 +0200 Subject: [PATCH 14/16] Improve Skip Command --- .../java/com/bbn/hadder/commands/music/SkipCommand.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index f7bd31c..5695395 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -32,7 +32,12 @@ public class SkipCommand implements Command { "commands.music.skip.success.title", "commands.music.skip.success.description").build()).queue(); } else { - e.getTextChannel().sendMessage("Get rekt lol Mach Loop aus noob").queue(); + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false); + e.getAudioManager().forceSkipTrack(e); + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(true); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.skip.success.title", + "commands.music.skip.success.description").build()).queue(); } } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, -- 2.45.3 From 4a16b9f70f567ef3747e5c31bb33659f29d08f53 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 19 Sep 2020 21:37:44 +0200 Subject: [PATCH 15/16] Update maven.yml --- .github/workflows/maven.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1a0eb28..84eb287 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -32,15 +32,15 @@ jobs: local: ./target/Hadder-Build.jar remote: /home/Hadder-Build.jar host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} + privateKey: ${{ secrets.PK }} + passphrase: ${{ secrets.PP }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} port: ${{ secrets.PORT }} + key: ${{ secrets.PK }} + passphrase: ${{ secrets.PP }} script: /home/deploy.sh - name: Send Webhook Notification if: always() -- 2.45.3 From d2d9f16ad9af805c43cceb49cbdad5bf0eab7922 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 19 Sep 2020 21:42:07 +0200 Subject: [PATCH 16/16] Update maven.yml --- .github/workflows/maven.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 84eb287..aa30f8c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -33,14 +33,12 @@ jobs: remote: /home/Hadder-Build.jar host: ${{ secrets.HOST }} privateKey: ${{ secrets.PK }} - passphrase: ${{ secrets.PP }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: host: ${{ secrets.HOST }} port: ${{ secrets.PORT }} key: ${{ secrets.PK }} - passphrase: ${{ secrets.PP }} script: /home/deploy.sh - name: Send Webhook Notification if: always() -- 2.45.3