From e051c8122129c72029760fdbe40e24ced54481cb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 01:04:10 +0100 Subject: [PATCH 01/49] A new command? :thinking: --- src/main/java/com/bbn/hadder/Hadder.java | 1 + src/main/resources/Translations/Translations_en.properties | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index f96792f..e6c8972 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -88,6 +88,7 @@ public class Hadder { new AboutCommand(), new LanguageCommand(), new ClydeCommand(), + new PlayCommand(), new StarBoardCommand()), config, helpCommand); builder.addEventListeners( diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index c72b94c..c5b75dc 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -178,6 +178,8 @@ commands.music.leave.success.description = I successfully disconnected from the 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.play.success.title = %extra% Now playing %extra% +commands.music.play.success.description = Playing some cool stuff xD commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 895d06d7148b03afe4c07f6eba7a172be853cf60 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 09:57:40 +0100 Subject: [PATCH 02/49] Screenshare is back --- src/main/java/com/bbn/hadder/Hadder.java | 4 ++- .../hadder/commands/music/StopCommand.java | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/StopCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index e6c8972..9fbd153 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -57,6 +57,7 @@ public class Hadder { new RebootCommand(), new EqualsCommand(), new InviteCommand(), + new ScreenShareCommand(), new NickCommand(), new PrefixCommand(), new BlowjobCommand(), @@ -89,7 +90,8 @@ public class Hadder { new LanguageCommand(), new ClydeCommand(), new PlayCommand(), - new StarBoardCommand()), config, helpCommand); + new StarBoardCommand(), + new StopCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java new file mode 100644 index 0000000..da77b5e --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -0,0 +1,31 @@ +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; + +/** + * @author Skidder / GregTCLTK + */ + +public class StopCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + + } + + @Override + public String[] labels() { + return new String[]{"stop"}; + } + + @Override + public String description() { + return "Stops the song"; + } + + @Override + public String usage() { + return ""; + } +} -- 2.45.3 From 4f7f675a8a10105904cd0aa947120d0bc1781dd0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 11:12:01 +0100 Subject: [PATCH 03/49] Update --- src/main/java/com/bbn/hadder/utils/MessageEditor.java | 2 +- .../resources/Translations/Translations_en.properties | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 2f22d85..c7205f1 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -56,7 +56,7 @@ public class MessageEditor { switch (type) { case INFO: builder - .setColor(new Color(47, 94, 105)) + .setColor(new Color(78, 156, 174)) .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") .setTimestamp(Instant.now()); break; diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index c5b75dc..feb12e4 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -178,8 +178,14 @@ commands.music.leave.success.description = I successfully disconnected from the 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.play.load.title = %extra% Now loading %extra% +commands.music.play.load.description = Trying to load the song... commands.music.play.success.title = %extra% Now playing %extra% -commands.music.play.success.description = Playing some cool stuff xD +commands.music.play.success.description = Now playing %extra% +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.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From b1f82ae79d9a82226d6d3b7836728877834607f0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 12:24:48 +0100 Subject: [PATCH 04/49] Better Starboard --- .../com/bbn/hadder/commands/moderation/StarBoardCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 50d6987..3371eec 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java @@ -14,7 +14,7 @@ public class StarBoardCommand implements Command { event.getChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, - "commands.moderation.starboard.successchannel","") + "commands.moderation.starboard.success.title","") .build()) .queue(); } else { diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 2fd24e1..dc6faa8 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -162,7 +162,7 @@ commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. commands.moderation.rules.emoji.error.description = The given emote can't be used. commands.moderation.rules.help.description = Setup the rules on your Discord server -commands.moderation.starboard.successchannel=Successfully set the Channel\! +commands.moderation.starboard.success.title = Successfully set the Channel\! commands.music.join.success.title = Successfully connected commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3 From 54d109226a86a172dc1d3c213818b1514814a4b2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 12:50:38 +0100 Subject: [PATCH 05/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 69d45cf..3b69594 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -27,7 +27,7 @@ commands.fun.gif.help.description = Look for a GIF on Giphy commands.fun.meme.success.title = Your random meme commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. commands.fun.meme.help.description = Sends you a random meme. -commands.fun.clyde.help.description = Send a message as a webhook named Clyde. +commands.fun.clyde.help.description = Sends a message as a webhook named Clyde. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. -- 2.45.3 From 6bce81e2f893b3f0700cc49034465d10ebb81728 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 14:30:51 +0100 Subject: [PATCH 06/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 06576ae..16be264 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -4,7 +4,7 @@ Hadder = Hadderino -user = <@User> +user = <@Benutzer> searchterm = username = number = /all @@ -16,15 +16,15 @@ region = guildid = content = -error = Error -none = None -success\! = Success\! +error = Fehler +none = Keine +success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme +commands.fun.meme.success.title = Deine zufällige Meme commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. commands.fun.meme.help.description = Sends you a random meme. commands.fun.clyde.help.description = Send a message as a webhook named Clyde. -- 2.45.3 From 9bc30cc2bff4e1614d8e5974ee6e0f61a98a84b2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 14:40:40 +0100 Subject: [PATCH 07/49] 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 16be264..28c5419 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -2,12 +2,12 @@ # @author Skidder / GregTCLTK # -Hadder = Hadderino +Hadder = Hadder user = <@Benutzer> searchterm = username = -number = /all +number = /alle prefix = userprefix = vc-name/id = @@ -17,15 +17,15 @@ guildid = content = error = Fehler -none = Keine +none = Nicht angegeben success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.error.description = Bitte versuchen Sie es erneut mit einem anderen Begriff. commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Deine zufällige Meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.meme.success.title = Dein zufälliges Meme +commands.fun.meme.api.error = Die Anfrage an die Meme-API konnte nicht verarbeitet werden. Bitte versuche es später erneut. commands.fun.meme.help.description = Sends you a random meme. commands.fun.clyde.help.description = Send a message as a webhook named Clyde. -- 2.45.3 From a7c9578ee545094b1329cb98d3f5526fb5f6562a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 14:46:21 +0100 Subject: [PATCH 08/49] Music stuff yk --- .../hadder/utils/AudioPlayerSendHandler.java | 25 ------------------- .../Translations/Translations_en.properties | 10 ++++++-- 2 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/utils/AudioPlayerSendHandler.java diff --git a/src/main/java/com/bbn/hadder/utils/AudioPlayerSendHandler.java b/src/main/java/com/bbn/hadder/utils/AudioPlayerSendHandler.java deleted file mode 100644 index ff3f483..0000000 --- a/src/main/java/com/bbn/hadder/utils/AudioPlayerSendHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.bbn.hadder.utils; - -/* - * @author Skidder / GregTCLTK - */ - -import net.dv8tion.jda.api.audio.AudioSendHandler; - -import javax.annotation.Nullable; -import java.nio.ByteBuffer; - -public class AudioPlayerSendHandler implements AudioSendHandler { - - @Override - public boolean canProvide() { - return false; - } - - @Nullable - @Override - public ByteBuffer provide20MsAudio() { - - return null; - } -} diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index dc6faa8..078cf78 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -180,12 +180,18 @@ commands.music.leave.error.description = I'm currently in no Voice Channel on th commands.music.leave.help.description = Leaves a 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.title = %extra% Now playing %extra% -commands.music.play.success.description = Now playing %extra% +commands.music.play.success.loading.title = %extra% Now playing %extra% commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song. commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube. +commands.music.play.success.title = Title +commands.music.play.success.author = Author +commands.music.play.success.length = Length +commands.music.play.help.description = Plays a 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 playing song commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 9733a8d465edf14a5b17fad0e3192618f0417433 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 14:50:35 +0100 Subject: [PATCH 09/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 28c5419..36db102 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -7,11 +7,11 @@ Hadder = Hadder user = <@Benutzer> searchterm = username = -number = /alle -prefix = +number = /all +prefix = userprefix = vc-name/id = -user+nickname = <@user> +user+nickname = <@Benutzer> region = guildid = content = @@ -22,7 +22,7 @@ success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. -commands.fun.gif.error.description = Bitte versuchen Sie es erneut mit einem anderen Begriff. +commands.fun.gif.error.description = Bitte versuche es mit einem anderen Begriff erneut. commands.fun.gif.help.description = Look for a GIF on Giphy commands.fun.meme.success.title = Dein zufälliges Meme commands.fun.meme.api.error = Die Anfrage an die Meme-API konnte nicht verarbeitet werden. Bitte versuche es später erneut. @@ -37,10 +37,10 @@ commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. -commands.general.equals.string.first = First String -commands.general.equals.string.second = Second String -commands.general.equals.string.result = Result +commands.general.equals.string.equals.false = Ja, aber eigentlich nein. Das ist nicht dasselbe. +commands.general.equals.string.first = Erste Zeichenkette +commands.general.equals.string.second = Zweite Zeichenkette +commands.general.equals.string.result = Ergebnis commands.general.equals.help.description = Check if two strings are the same commands.general.help.field.usage = Benutzung commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -- 2.45.3 From c35a9d0afc90fdd833d08a262ef075b0171f1512 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 15:00:39 +0100 Subject: [PATCH 10/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 36db102..dbb8ca0 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -8,7 +8,7 @@ user = <@Benutzer> searchterm = username = number = /all -prefix = +prefix = userprefix = vc-name/id = user+nickname = <@Benutzer> @@ -36,10 +36,10 @@ commands.general.about.success.field.one.description = Hadder is completely free commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! +commands.general.equals.string.equals.true = Ja\! Die erste String entspricht der zweiten String\! commands.general.equals.string.equals.false = Ja, aber eigentlich nein. Das ist nicht dasselbe. -commands.general.equals.string.first = Erste Zeichenkette -commands.general.equals.string.second = Zweite Zeichenkette +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 = Check if two strings are the same commands.general.help.field.usage = Benutzung @@ -60,19 +60,19 @@ commands.misc.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio -commands.misc.github.success.location = Location -commands.misc.github.success.website = Website +commands.misc.github.success.location = Standort +commands.misc.github.success.website = Webseite 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.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.description = Dieser Benutzer existiert nicht\! commands.misc.github.connect.title = Connect you 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. commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.title = Warte, das ist illegal commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel commands.misc.screenshare.channel.error.description = There is more than one channel with this name -- 2.45.3 From 901cc399d4af7727ea5cc159a183e191f67020e2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 15:10:52 +0100 Subject: [PATCH 11/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index dbb8ca0..21ed7f1 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -34,14 +34,14 @@ commands.general.about.success.description = Hadder is an open source Discord bo commands.general.about.success.field.one.title = Support the Developers commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows infos about Hadder -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String -commands.general.equals.string.equals.true = Ja\! Die erste String entspricht der zweiten String\! +commands.general.equals.string.first.request = Bitte sende mir den ersten String +commands.general.equals.string.second.request = Bitte sende mir den zweiten String +commands.general.equals.string.equals.true = Ja\! Der erste String entspricht dem zweiten String\! commands.general.equals.string.equals.false = Ja, aber eigentlich nein. Das ist nicht dasselbe. 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 = Check if two strings are the same +commands.general.equals.help.description = Prüfe, ob zwei Strings gleich sind commands.general.help.field.usage = Benutzung commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage -- 2.45.3 From 83597f2d9be56535b2c47c8c17384deeb19fc032 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 15:20:42 +0100 Subject: [PATCH 12/49] 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 21ed7f1..8603e66 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -41,7 +41,7 @@ commands.general.equals.string.equals.false = Ja, aber eigentlich nein. Das ist commands.general.equals.string.first = Erster String commands.general.equals.string.second = Zweiter String commands.general.equals.string.result = Ergebnis -commands.general.equals.help.description = Prüfe, ob zwei Strings gleich sind +commands.general.equals.help.description = Prüft ob zwei Strings gleich sind commands.general.help.field.usage = Benutzung commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command or explains its usage -- 2.45.3 From 869c9987ab270fadcd5c6940a0ec70ffdb37cbbc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 15:25:54 +0100 Subject: [PATCH 13/49] i18n stuff --- src/main/resources/Translations/Translations_en.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 078cf78..7281940 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -15,6 +15,7 @@ user+nickname = <@user> region = guildid = content = +song = error = Error none = None @@ -173,7 +174,7 @@ commands.music.join.error.connecting.trying.description = Hadder is already tryi commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.help.description = Joins your voice channel -commands.music.leave.success.title = \= Successfully disconnected +commands.music.leave.success.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 @@ -191,7 +192,7 @@ commands.music.play.success.length = Length commands.music.play.help.description = Plays a 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 playing song +commands.music.stop.help.description = Stops the song commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 7738951911ab1779d9c47bb81b2b47e6029ba6fb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 15:26:32 +0100 Subject: [PATCH 14/49] AudioPlayerSendHandler leak^^ --- .../hadder/audio/AudioPlayerSendHandler.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java diff --git a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java new file mode 100644 index 0000000..1863de2 --- /dev/null +++ b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java @@ -0,0 +1,49 @@ +package com.bbn.hadder.audio; + +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; +import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame; +import net.dv8tion.jda.api.audio.AudioSendHandler; + +import javax.annotation.Nullable; +import java.nio.ByteBuffer; + +/** + * @author Skidder / GregTCLTK + */ + +public class AudioPlayerSendHandler implements AudioSendHandler { + + private final AudioPlayer audioPlayer; + private AudioFrame lastFrame; + + public AudioPlayerSendHandler(AudioPlayer audioPlayer) { + this.audioPlayer = audioPlayer; + } + + @Override + public boolean canProvide() { + if (lastFrame == null) { + lastFrame = audioPlayer.provide(); + } + + return lastFrame != null; + } + + @Nullable + @Override + public ByteBuffer provide20MsAudio() { + if (lastFrame == null) { + lastFrame = audioPlayer.provide(); + } + + byte[] data = lastFrame != null ? lastFrame.getData() : null; + lastFrame = null; + + return ByteBuffer.wrap(data); + } + + @Override + public boolean isOpus() { + return true; + } +} -- 2.45.3 From 88bff41e9a709510a702d2aa92110fe82ce59152 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 15:30:39 +0100 Subject: [PATCH 15/49] Uh a AudioManager --- src/main/java/com/bbn/hadder/audio/AudioManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/audio/AudioManager.java diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java new file mode 100644 index 0000000..b133dca --- /dev/null +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -0,0 +1,9 @@ +package com.bbn.hadder.audio; + +/** + * @author Skidder / GregTCLTK + */ + +public class AudioManager { + +} -- 2.45.3 From c2cb2ae09164f0fbd82debe74398352f58227d19 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 15:40:36 +0100 Subject: [PATCH 16/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 8603e66..4a3ce59 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -12,7 +12,7 @@ prefix = userprefix = vc-name/id = user+nickname = <@Benutzer> -region = +region = guildid = content = @@ -20,7 +20,7 @@ error = Fehler none = Nicht angegeben success\! = Erfolgreich\! -commands.fun.avatar.success.title = Avatar of %extra% +commands.fun.avatar.success.title = Avatar von %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Bitte versuche es mit einem anderen Begriff erneut. commands.fun.gif.help.description = Look for a GIF on Giphy @@ -31,8 +31,8 @@ commands.fun.clyde.help.description = Send a message as a webhook named Clyde. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% +commands.general.about.success.field.one.title = Unterstütz die Entwickler +commands.general.about.success.field.one.description = Hadder ist für alle völlig kostenlos. Wir würden uns freuen, wenn Sie etwas Geld spenden [here]%extra% commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Bitte sende mir den ersten String commands.general.equals.string.second.request = Bitte sende mir den zweiten String @@ -57,7 +57,7 @@ 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.github.link.title = Link your GitHub Account +commands.misc.github.link.title = Verbinde dein GitHub Konto commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Standort -- 2.45.3 From f126d3f868498de8574f20eec77b2c557407d1c0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 15:50:36 +0100 Subject: [PATCH 17/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 4a3ce59..445a72c 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -31,8 +31,8 @@ commands.fun.clyde.help.description = Send a message as a webhook named Clyde. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. -commands.general.about.success.field.one.title = Unterstütz die Entwickler -commands.general.about.success.field.one.description = Hadder ist für alle völlig kostenlos. Wir würden uns freuen, wenn Sie etwas Geld spenden [here]%extra% +commands.general.about.success.field.one.title = Unterstütze die Entwickler +commands.general.about.success.field.one.description = Hadder ist für alle völlig kostenlos. Wir würden uns freuen, wenn du [hier]%extra% etwas Geld spenden würdest. commands.general.about.help.description = Shows infos about Hadder commands.general.equals.string.first.request = Bitte sende mir den ersten String commands.general.equals.string.second.request = Bitte sende mir den zweiten String @@ -74,7 +74,7 @@ commands.misc.github.help.description = Displays information about a GitHub user commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Warte, das ist illegal commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.title = Bitte wähle einen Sprachkanal commands.misc.screenshare.channel.error.description = There is more than one channel with this name commands.misc.screenshare.number.error.title = You specified a wrong number\! commands.misc.screenshare.number.error.description = This isn't a Number. @@ -93,32 +93,32 @@ commands.moderation.lear.all.success.title = Successfully deleted commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.description = Successfully deleted %extra% messages. -commands.moderation.clear.message.error.title = No messages\! -commands.moderation.clear.message.error.description = There are no messages in this channel. -commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.clear.message.error.title = Keine Nachrichten\! +commands.moderation.clear.message.error.description = Es gibt keine Nachrichten in diesem Kanal. +commands.moderation.clear.help.description = Löscht die angegebene Anzahl von Nachrichten. commands.moderation.prefix.success.title = %extra% Successfully set %extra% commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to `%extra%`. commands.moderation.prefix.error.description = The prefix must not contain **"** commands.moderation.prefix.help.description = Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.title = Bereits aktiviert commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. commands.moderation.kick.success.title = %extra% Successfully kicked %extra% commands.moderation.kick.success.description = I successfully kicked %extra%. -commands.moderation.kick.error.title = Not possible -commands.moderation.kick.myself.error.description = I can not kick myself\! -commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! -commands.moderation.kick.help.description = Kicks one or more user from the server. -commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. +commands.moderation.kick.error.title = Nicht möglich +commands.moderation.kick.myself.error.description = Ich kann mich nicht selbst kicken\! +commands.moderation.kick.yourself.error.description = Du kannst dich nicht selbst kicken. +commands.moderation.kick.mass.success.description = Ich habe erfolgreich 69 Mitglieder gekickt\! +commands.moderation.kick.help.description = Wirft einen oder mehrere Benutzer vom Server. +commands.moderation.kick.masskick.success.description = Ich habe %extra% Mitglieder erfolgreich gekickt. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.error.title = Warte, das ist illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this commands.moderation.link.request.accept.title = ) wants to link guilds\! commands.moderation.link.request.accept.description = React with the reactions to accept or decline it @@ -126,12 +126,12 @@ commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. commands.moderation.nick.success.title = %extra% Successfully nicked %extra% commands.moderation.nick.success.description = I successfully nicked %extra%. -commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.myself.success.description = Ich habe meinen Spitznamen erfolgreich geändert. commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Rename a one or more user. -commands.moderation.regionchange.regions.title = All regions -commands.moderation.regionchange.success.title = Successfully set region -commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.nick.help.description = Benenne einen oder mehrere Benutzer um. +commands.moderation.regionchange.regions.title = Alle Regionen +commands.moderation.regionchange.success.title = Region erfolgreich gesetzt +commands.moderation.regionchange.success.description = Ich habe die neue Serverregion erfolgreich auf %extra% gesetzt. commands.moderation.regionchange.help.description = Changes the server region to locked regions. commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. -- 2.45.3 From 1276b76a91c364fd3dbb2a643e59e48a0748b78c Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 16:30:41 +0100 Subject: [PATCH 18/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 445a72c..5a2554f 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -89,10 +89,10 @@ 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 baned %extra% Members\! commands.moderation.ban.help.description = Bans one ore more user from the server -commands.moderation.lear.all.success.title = Successfully deleted +commands.moderation.lear.all.success.title = Erfolgreich gelöscht commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. -commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! -commands.moderation.clear.success.description = Successfully deleted %extra% messages. +commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! +commands.moderation.clear.success.description = %extra% Nachrichten erfolgreich gelöscht. commands.moderation.clear.message.error.title = Keine Nachrichten\! commands.moderation.clear.message.error.description = Es gibt keine Nachrichten in diesem Kanal. commands.moderation.clear.help.description = Löscht die angegebene Anzahl von Nachrichten. @@ -108,7 +108,7 @@ commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktivi commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.invitedetect.help.description = Aktiviere oder deaktiviere die Discord Einladungs-Linkerkennung. commands.moderation.kick.success.title = %extra% Successfully kicked %extra% commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Nicht möglich @@ -128,10 +128,10 @@ commands.moderation.nick.success.title = %extra% Successfully nicked %extra% commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = Ich habe meinen Spitznamen erfolgreich geändert. commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. -commands.moderation.nick.help.description = Benenne einen oder mehrere Benutzer um. +commands.moderation.nick.help.description = Benennt einen oder mehrere Benutzer um. commands.moderation.regionchange.regions.title = Alle Regionen commands.moderation.regionchange.success.title = Region erfolgreich gesetzt -commands.moderation.regionchange.success.description = Ich habe die neue Serverregion erfolgreich auf %extra% 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 = %extra% Successfully added role(s) %extra% commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. @@ -140,15 +140,15 @@ commands.moderation.role.remove.success.description = I successfully removed %ex 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. -commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.title = Kanal nicht gefunden commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. -commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.title = Regeln commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. -commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.title = Rolle existiert nicht commands.moderation.rules.role.error.description = The specified role does not exist on this guild. -commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.title = Falsche Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote 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. -- 2.45.3 From c798fff7615ddc0494bcadec4f9d60f9aee1e060 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 16:40:39 +0100 Subject: [PATCH 19/49] 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 5a2554f..264c67f 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -92,7 +92,7 @@ commands.moderation.ban.help.description = Bans one ore more user from the serve commands.moderation.lear.all.success.title = Erfolgreich gelöscht commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! -commands.moderation.clear.success.description = %extra% Nachrichten erfolgreich gelöscht. +commands.moderation.clear.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. commands.moderation.clear.message.error.title = Keine Nachrichten\! commands.moderation.clear.message.error.description = Es gibt keine Nachrichten in diesem Kanal. commands.moderation.clear.help.description = Löscht die angegebene Anzahl von Nachrichten. @@ -108,7 +108,7 @@ commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktivi commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description = Aktiviere oder deaktiviere die Discord Einladungs-Linkerkennung. +commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. commands.moderation.kick.success.title = %extra% Successfully kicked %extra% commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Nicht möglich @@ -140,7 +140,7 @@ commands.moderation.role.remove.success.description = I successfully removed %ex 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. -commands.moderation.rules.channel.error.title = Kanal nicht gefunden +commands.moderation.rules.channel.error.title = Kanal konnte nicht gefunden werden commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Regeln commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -- 2.45.3 From 7907bedf154dbddbe56dcb015f8927a98825a3b0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 16:43:37 +0100 Subject: [PATCH 20/49] Fix --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 7281940..8544d79 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -115,7 +115,7 @@ commands.moderation.kick.success.description = I successfully kicked %extra%. commands.moderation.kick.error.title = Not possible commands.moderation.kick.myself.error.description = I can not kick myself\! commands.moderation.kick.yourself.error.description = You can't kick yourself. -commands.moderation.kick.mass.success.description = I successfully kicked 69 Members\! +commands.moderation.kick.mass.success.description = I successfully kicked %extra% Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -- 2.45.3 From f373b5e9692318f8dc2a5eb8a2c5c6f60c041c2a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 16:47:37 +0100 Subject: [PATCH 21/49] Music pre-release!!! --- .../java/com/bbn/hadder/audio/AudioInfo.java | 28 +++++ .../com/bbn/hadder/audio/AudioManager.java | 100 ++++++++++++++++ .../com/bbn/hadder/audio/TrackManager.java | 73 ++++++++++++ .../hadder/commands/music/PlayCommand.java | 109 ++++++++++++++++++ .../hadder/commands/music/StopCommand.java | 12 +- 5 files changed, 320 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/audio/AudioInfo.java create mode 100644 src/main/java/com/bbn/hadder/audio/TrackManager.java create mode 100644 src/main/java/com/bbn/hadder/commands/music/PlayCommand.java diff --git a/src/main/java/com/bbn/hadder/audio/AudioInfo.java b/src/main/java/com/bbn/hadder/audio/AudioInfo.java new file mode 100644 index 0000000..8aa35e9 --- /dev/null +++ b/src/main/java/com/bbn/hadder/audio/AudioInfo.java @@ -0,0 +1,28 @@ +package com.bbn.hadder.audio; + +import com.sedmelluq.discord.lavaplayer.track.AudioTrack; +import net.dv8tion.jda.api.entities.Member; + +/** + * @author Skidder / GregTCLTK + */ + +public class AudioInfo { + + private final AudioTrack track; + private final Member author; + + AudioInfo(AudioTrack track, Member author) { + this.track = track; + this.author = author; + } + + public AudioTrack getTrack() { + return track; + } + + public Member getAuthor() { + return author; + } + +} diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index b133dca..60db2f8 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -1,9 +1,109 @@ package com.bbn.hadder.audio; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; +import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; +import com.sedmelluq.discord.lavaplayer.track.AudioTrack; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Message; + +import java.util.AbstractMap; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** * @author Skidder / GregTCLTK */ public class AudioManager { + public static final Map> players = new HashMap<>(); + public static final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); + + public static void loadTrack(String identifier, CommandEvent event, Message msg) { + + Guild guild = event.getGuild(); + AudioManager.getPlayer(guild); + + myManager.loadItemOrdered(guild, identifier, new AudioLoadResultHandler() { + + @Override + public void trackLoaded(AudioTrack track) { + AudioManager.getTrackManager(guild).queue(track, event.getMember()); + msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.success.loading.title", "⏯", + "", "") + .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false) + .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true) + .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"), + String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length), + TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1), + TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true) + .build()).queue(); + } + + @Override + public void playlistLoaded(AudioPlaylist playlist) { + if (playlist.getSelectedTrack() != null) { + trackLoaded(playlist.getSelectedTrack()); + } else if (playlist.isSearchResult()) { + trackLoaded(playlist.getTracks().get(0)); + } else { + for (int i = 0; i < Math.min(playlist.getTracks().size(), 200); i++) { + AudioManager.getTrackManager(guild).queue(playlist.getTracks().get(i), event.getMember()); + } + } + } + + @Override + public void noMatches() { + msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.error.match.title", "❌", + "commands.music.play.error.match.description", "") + .build()).queue(); + } + + @Override + public void loadFailed(FriendlyException e) { + msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.error.load.title", "❌", + "commands.music.play.error.load.description", "") + .build()).queue(); + } + }); + } + + public static boolean hasPlayer(Guild guild) { + return players.containsKey(guild.getId()); + } + + public static AudioPlayer getPlayer(Guild guild) { + AudioPlayer p; + if (hasPlayer(guild)) { + p = players.get(guild.getId()).getKey(); + } else { + p = createPlayer(guild); + } + return p; + } + + public static TrackManager getTrackManager(Guild guild) { + return players.get(guild.getId()).getValue(); + } + + public static AudioPlayer createPlayer(Guild guild) { + AudioPlayer nPlayer = myManager.createPlayer(); + TrackManager manager = new TrackManager(nPlayer); + nPlayer.addListener(manager); + guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer)); + players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager)); + return nPlayer; + } + } diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java new file mode 100644 index 0000000..b4c1e9a --- /dev/null +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -0,0 +1,73 @@ +package com.bbn.hadder.audio; + +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; +import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter; +import com.sedmelluq.discord.lavaplayer.track.AudioTrack; +import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.VoiceChannel; + +import java.util.*; +import java.util.concurrent.LinkedBlockingQueue; + +/** + * @author Skidder / GregTCLTK + */ + +public class TrackManager extends AudioEventAdapter { + + private final AudioPlayer player; + private final Queue queue; + + public TrackManager(AudioPlayer player) { + this.player = player; + this.queue = new LinkedBlockingQueue<>(); + } + + public void queue(AudioTrack track, Member author) { + AudioInfo info = new AudioInfo(track, author); + queue.add(info); + + if (player.getPlayingTrack() == null) { + player.playTrack(track); + } + } + + @Override + public void onTrackStart(AudioPlayer player, AudioTrack track) { + AudioInfo info = queue.element(); + VoiceChannel vChan = info.getAuthor().getVoiceState().getChannel(); + if (vChan == null) { + player.stopTrack(); + } else { + info.getAuthor().getGuild().getAudioManager().openAudioConnection(vChan); + } + } + + @Override + public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { + Guild g = queue.poll().getAuthor().getGuild(); + if (queue.isEmpty()) { + g.getAudioManager().closeAudioConnection(); + } else { + player.playTrack(queue.element().getTrack()); + } + } + + public Set getQueuedTracks() { + return new LinkedHashSet<>(queue); + } + + public void purgeQueue() { + queue.clear(); + } + + public void remove(AudioInfo entry) { + queue.remove(entry); + } + + public AudioInfo getTrackInfo(AudioTrack track) { + return queue.stream().filter(audioInfo -> audioInfo.getTrack().equals(track)).findFirst().orElse(null); + } +} diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java new file mode 100644 index 0000000..9e34f3e --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -0,0 +1,109 @@ +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.audio.AudioInfo; +import com.bbn.hadder.audio.AudioManager; +import com.bbn.hadder.audio.AudioPlayerSendHandler; +import com.bbn.hadder.audio.TrackManager; +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; +import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; +import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; +import com.sedmelluq.discord.lavaplayer.track.AudioTrack; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Message; + +import java.net.URL; +import java.sql.Timestamp; +import java.util.*; +import java.util.concurrent.TimeUnit; + +import static com.bbn.hadder.audio.AudioManager.myManager; + +/** + * @author Skidder / GregTCLTK + */ + +public class PlayCommand implements Command { + + /* + private static final String CD = "\uD83D\uDCBF"; + private static final String MIC = "\uD83C\uDFA4 **|>** "; */ + + @Override + public void executed(String[] args, CommandEvent event) { + if (args.length > 0) { + if (event.getMember().getVoiceState().inVoiceChannel()) { + String input = event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "play ", "").replaceFirst(event.getRethink().getUserPrefix(event.getAuthor().getId()) + "play ", ""); + try { + new URL(input).toURI(); + Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.load.title", "⭕", + "commands.music.play.load.description", "").build()).complete(); + AudioManager.loadTrack(input, event, msg); + } catch (Exception ignore) { + Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.load.title", "⏯", + "commands.music.play.load.description", "").build()).complete(); + AudioManager.loadTrack("ytsearch: " + input, event, msg); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.WARNING, + "commands.music.join.error.channel.title", + "commands.music.join.error.channel.description") + .build()).queue(); + } + } else event.getHelpCommand().sendHelp(this, event); + + /* OUTSOURCE THIS + Guild guild = event.getGuild(); + if (args.length == 1) { + switch (args[0].toLowerCase()) { + case "info": + if (!hasPlayer(guild) || getPlayer(guild).getPlayingTrack() == null) { // No song is playing + event.getTextChannel().sendMessage("No song is being played at the moment! *It's your time to shine..*").queue(); + } else { + AudioTrack track = getPlayer(guild).getPlayingTrack(); + event.getTextChannel().sendMessage("Track Info" + String.format(QUEUE_DESCRIPTION, CD, getOrNull(track.getInfo().title), + "\n\u23F1 **|>** `[ " + getTimestamp(track.getPosition()) + " / " + getTimestamp(track.getInfo().length) + " ]`", + "\n" + MIC, getOrNull(track.getInfo().author), + "\n\uD83C\uDFA7 **|>** " + "")).queue(); + } + break; + + case "queue": + if (!hasPlayer(guild) || getTrackManager(guild).getQueuedTracks().isEmpty()) { + event.getTextChannel().sendMessage("The queue is empty! Load a song with **" + + "dd" + "music play**!").queue(); + } else { + StringBuilder sb = new StringBuilder(); + Set queue = getTrackManager(guild).getQueuedTracks(); + queue.forEach(audioInfo -> sb.append(buildQueueMessage(audioInfo))); + } + break; + } + } */ + + } + + @Override + public String[] labels() { + return new String[]{"play"}; + } + + @Override + public String description() { + return "commands.music.play.help.description"; + } + + @Override + public String usage() { + return "song"; + } +} diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index da77b5e..1adeb88 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -1,7 +1,9 @@ package com.bbn.hadder.commands.music; +import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; /** * @author Skidder / GregTCLTK @@ -11,7 +13,13 @@ public class StopCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - + AudioManager.players.remove(event.getGuild().getId()); + AudioManager.getPlayer(event.getGuild()).destroy(); + AudioManager.getTrackManager(event.getGuild()).purgeQueue(); + event.getGuild().getAudioManager().closeAudioConnection(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.stop.success.title", + "commands.music.stop.success.description").build()).queue(); } @Override @@ -21,7 +29,7 @@ public class StopCommand implements Command { @Override public String description() { - return "Stops the song"; + return "commands.music.stop.help.description"; } @Override -- 2.45.3 From 4814cb00a02e04595e45d0d0b212c7b259b503c9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 16:50:06 +0100 Subject: [PATCH 22/49] Unused import fix --- .../bbn/hadder/commands/music/PlayCommand.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 9e34f3e..37854d0 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -1,29 +1,13 @@ package com.bbn.hadder.commands.music; -import com.bbn.hadder.audio.AudioInfo; import com.bbn.hadder.audio.AudioManager; -import com.bbn.hadder.audio.AudioPlayerSendHandler; -import com.bbn.hadder.audio.TrackManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; -import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; -import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; -import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; -import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; -import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; -import com.sedmelluq.discord.lavaplayer.track.AudioTrack; -import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import java.net.URL; -import java.sql.Timestamp; -import java.util.*; -import java.util.concurrent.TimeUnit; -import static com.bbn.hadder.audio.AudioManager.myManager; /** * @author Skidder / GregTCLTK -- 2.45.3 From 8e53bf8cf958d7c7664eb3121abdb093bdf781dc Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 16:50:36 +0100 Subject: [PATCH 23/49] 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 264c67f..4e4edb5 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -9,7 +9,7 @@ searchterm = username = number = /all prefix = -userprefix = +userprefix = vc-name/id = user+nickname = <@Benutzer> region = @@ -84,13 +84,13 @@ commands.misc.screenshare.help.description = Shows you the link to share your sc commands.moderation.ban.success.title = %extra% Successfully banned %extra% commands.moderation.ban.success.description = I successfully baned %extra% -commands.moderation.ban.error.title = Not possible -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 baned %extra% Members\! +commands.moderation.ban.error.title = Nicht möglich +commands.moderation.ban.myself.error.description = Ich kann mich nicht selbst bannen\! +commands.moderation.ban.yourself.error.description = Du kannst dich nicht selbst bannen\! +commands.moderation.ban.massban.success.description = Ich habe %extra% Mitglieder erfolgreich gebannt\! commands.moderation.ban.help.description = Bans one ore more user from the server commands.moderation.lear.all.success.title = Erfolgreich gelöscht -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.lear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! commands.moderation.clear.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. commands.moderation.clear.message.error.title = Keine Nachrichten\! -- 2.45.3 From 10b0e40be3611d563acd698fde6ae1b9e04121db Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 18:40:37 +0100 Subject: [PATCH 24/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 4e4edb5..4a6842b 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -175,11 +175,11 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel. commands.music.join.help.description = Joins your voice channel commands.music.leave.success.title = \= Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.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.error.tile = Nicht verbunden +commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild +commands.music.leave.help.description = Verlässt einen Sprachkanal -commands.nsfw.gif.error.title = GIF not showing? Click here +commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicken Sie hier commands.nsfw.img.error.title = Image not showing? Click here commands.nsfw.anal.help.description = Shows a random anal gif. commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -- 2.45.3 From c55c8ca7dbce24a4207bd7046d36022ec6fca4f3 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 18:50:37 +0100 Subject: [PATCH 25/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 4a6842b..cd08451 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -180,11 +180,11 @@ commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal a commands.music.leave.help.description = Verlässt einen Sprachkanal commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicken Sie hier -commands.nsfw.img.error.title = Image not showing? Click here -commands.nsfw.anal.help.description = Shows a random anal gif. -commands.nsfw.bdsm.help.description = Shows a random BDSM picture. -commands.nsfw.blowjob.help.description = Shows a random Blowjob picture. -commands.nsfw.boobs.help.description = Shows a random boob gif. +commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicken Sie hier +commands.nsfw.anal.help.description = Zeigt einen zufälligen Anal GIF. +commands.nsfw.bdsm.help.description = Zeigt ein zufälliges BDSM-Bild. +commands.nsfw.blowjob.help.description = Zeigt ein zufälliges Blowjob Bild. +commands.nsfw.boobs.help.description = Zeigt einen zufälligen Boob GIF. commands.nsfw.cum.help.description = Shows a random cum gif. commands.nsfw.erotic.help.description = Shows a random erotic picture. commands.nsfw.feet.help.description = Shows a random feet gif. -- 2.45.3 From 8a316f7db84b9006eb976b8db0051774b84712f4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 19:00:38 +0100 Subject: [PATCH 26/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index cd08451..cad43c4 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -185,17 +185,17 @@ commands.nsfw.anal.help.description = Zeigt einen zufälligen Anal GIF. commands.nsfw.bdsm.help.description = Zeigt ein zufälliges BDSM-Bild. commands.nsfw.blowjob.help.description = Zeigt ein zufälliges Blowjob Bild. commands.nsfw.boobs.help.description = Zeigt einen zufälligen Boob GIF. -commands.nsfw.cum.help.description = Shows a random cum gif. -commands.nsfw.erotic.help.description = Shows a random erotic picture. -commands.nsfw.feet.help.description = Shows a random feet gif. -commands.nsfw.fingering.help.description = Shows a random fingering gif. -commands.nsfw.linking.help.description = Shows a random licking gif. -commands.nsfw.porn.help.description = Shows a random porn gif. -commands.nsfw.pussy.help.description = Shows a random pussy gif. -commands.nsfw.randomporn.help.description = Shows a completely random porn gif. -commands.nsfw.solo.help.description = Shows a random solo gif. -commands.nsfw.spank.help.description = Shows a random spank gif. -commands.nsfw.trans.help.description = Shows a random trans picture. +commands.nsfw.cum.help.description = Zeigt einen zufälligen Cum GIF. +commands.nsfw.erotic.help.description = Zeigt ein zufälliges Erotik Bild. +commands.nsfw.feet.help.description = Zeigt einen zufälligen Feet GIF. +commands.nsfw.fingering.help.description = Zeigt einen zufälligen fingering GIF. +commands.nsfw.linking.help.description = Zeigt einen zufälligen licking GIF. +commands.nsfw.porn.help.description = Zeigt einen zufälligen Porn GIF. +commands.nsfw.pussy.help.description = Zeigt einen zufälligen Pussy GIF. +commands.nsfw.randomporn.help.description = Zeigt ein völlig zufälliges Porno-Gif. +commands.nsfw.solo.help.description = Zeigt einen zufälligen Solo GIF. +commands.nsfw.spank.help.description = Zeigt einen zufälligen spank GIF. +commands.nsfw.trans.help.description = Zeigt ein zufälliges Trans Bild. commands.owner.eval.success.title = Eval Command commands.owner.eval.success.input = Input -- 2.45.3 From 0471d4fa1bfa64e87bc9a83c796f178281f33a67 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 19:31:02 +0100 Subject: [PATCH 27/49] 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 3b69594..70c0afc 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -23,9 +23,9 @@ success\! = Success\! commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. -commands.fun.gif.help.description = Look for a GIF on Giphy -commands.fun.meme.success.title = Your random meme -commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. +commands.fun.gif.help.description = Looks for a GIF on Giphy. +commands.fun.meme.success.title = Your random meme\: +commands.fun.meme.api.error = The request to the meme API could not be processed. Please try again later. commands.fun.meme.help.description = Sends you a random meme. commands.fun.clyde.help.description = Sends a message as a webhook named Clyde. -- 2.45.3 From 0588c5df1d0881b4aef46cd4ed54f635b611f800 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 19:40:37 +0100 Subject: [PATCH 28/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index cad43c4..a29ce8d 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -87,7 +87,7 @@ commands.moderation.ban.success.description = I successfully baned %extra% commands.moderation.ban.error.title = Nicht möglich commands.moderation.ban.myself.error.description = Ich kann mich nicht selbst bannen\! commands.moderation.ban.yourself.error.description = Du kannst dich nicht selbst bannen\! -commands.moderation.ban.massban.success.description = Ich habe %extra% Mitglieder erfolgreich gebannt\! +commands.moderation.ban.massban.success.description = Ich habe erfolgreich %extra% Mitglieder gebannt\! commands.moderation.ban.help.description = Bans one ore more user 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. @@ -179,37 +179,37 @@ commands.music.leave.error.tile = Nicht verbunden commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild commands.music.leave.help.description = Verlässt einen Sprachkanal -commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicken Sie hier -commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicken Sie hier +commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier +commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier commands.nsfw.anal.help.description = Zeigt einen zufälligen Anal GIF. -commands.nsfw.bdsm.help.description = Zeigt ein zufälliges BDSM-Bild. +commands.nsfw.bdsm.help.description = Zeigt ein zufälliges BDSM Bild. commands.nsfw.blowjob.help.description = Zeigt ein zufälliges Blowjob Bild. commands.nsfw.boobs.help.description = Zeigt einen zufälligen Boob GIF. commands.nsfw.cum.help.description = Zeigt einen zufälligen Cum GIF. commands.nsfw.erotic.help.description = Zeigt ein zufälliges Erotik Bild. commands.nsfw.feet.help.description = Zeigt einen zufälligen Feet GIF. -commands.nsfw.fingering.help.description = Zeigt einen zufälligen fingering GIF. -commands.nsfw.linking.help.description = Zeigt einen zufälligen licking GIF. +commands.nsfw.fingering.help.description = Shows a random fingering gif. +commands.nsfw.linking.help.description = Shows a random licking gif. commands.nsfw.porn.help.description = Zeigt einen zufälligen Porn GIF. commands.nsfw.pussy.help.description = Zeigt einen zufälligen Pussy GIF. -commands.nsfw.randomporn.help.description = Zeigt ein völlig zufälliges Porno-Gif. +commands.nsfw.randomporn.help.description = Zeigt ein völlig zufälliges Porno GIF. commands.nsfw.solo.help.description = Zeigt einen zufälligen Solo GIF. -commands.nsfw.spank.help.description = Zeigt einen zufälligen spank GIF. +commands.nsfw.spank.help.description = Shows a random spank gif. commands.nsfw.trans.help.description = Zeigt ein zufälliges Trans Bild. commands.owner.eval.success.title = Eval Command -commands.owner.eval.success.input = Input -commands.owner.eval.success.output = Output +commands.owner.eval.success.input = Eingabe +commands.owner.eval.success.output = Ausgabe 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 +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 commands.owner.guildleave.error.description = I can not leave from this guild. Maybe this isn't a ID? commands.owner.guildleave.help.description = Quit from a guild commands.owner.reboot.help.description = Restart the bot -commands.owner.shutdown.success.title = Shutdown +commands.owner.shutdown.success.title = Fährt herrunter commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command -- 2.45.3 From 0ca8a931d452564c702d1bb3a40aaceaa2de070c Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 19:50:33 +0100 Subject: [PATCH 29/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index a29ce8d..dc6efb6 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -121,7 +121,7 @@ commands.moderation.link.request.success.description = If i'm on this guild i se commands.moderation.link.error.title = Warte, das ist illegal. commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.request.accept.description = Reagiere mit den Reaktionen um es zu akzeptieren oder abzulehnen commands.moderation.link.set.title = Set the thing boi commands.moderation.link.help.description = Links two or more servers. commands.moderation.nick.success.title = %extra% Successfully nicked %extra% @@ -141,9 +141,9 @@ commands.moderation.role.help.description = Adds and removes one or more role(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. commands.moderation.rules.channel.error.title = Kanal konnte nicht gefunden werden -commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.channel.error.description = Ich kann den angegebenen Kanal nicht finden. Bitte starte das Setup erneut. commands.moderation.rules.rules.title = Regeln -commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.rules.description = Der Kanal wurde erfolgreich auf %extra% gesetzt. Bitte senden Sie mir die Regeln jetzt. commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Rolle existiert nicht @@ -201,7 +201,7 @@ commands.owner.eval.success.title = Eval Command commands.owner.eval.success.input = Eingabe commands.owner.eval.success.output = Ausgabe commands.owner.eval.success.timing = Timing -commands.owner.eval.help.description = Execute the given code +commands.owner.eval.help.description = führe 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. @@ -216,7 +216,7 @@ 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.description = Legt die neue primäre Sprache für einen Benutzer fest. 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%`. -- 2.45.3 From 6f5ca7248b397bb81ac0c171a1d930c7d977f82d Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 19:50:35 +0100 Subject: [PATCH 30/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 70c0afc..6f4a5e8 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -33,7 +33,7 @@ commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% -commands.general.about.help.description = Shows infos about Hadder +commands.general.about.help.description = Shows informations about Hadder. commands.general.equals.string.first.request = Please send me the first String commands.general.equals.string.second.request = Please send me the second String commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! -- 2.45.3 From a60cf667472844dedb38f59d8f195cc3cf805a9c Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 20:00:37 +0100 Subject: [PATCH 31/49] 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 dc6efb6..413623b 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -107,10 +107,10 @@ commands.moderation.invitedetect.activate.error.description = The invite link de commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.deactivate.error.description = Die Einladungslink-Erkennung ist auf dieser Guild bereits deaktiviert. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. -commands.moderation.kick.success.title = %extra% Successfully kicked %extra% -commands.moderation.kick.success.description = I successfully kicked %extra%. +commands.moderation.kick.success.title = %extra% hat %extra% erfolgreich gekickt +commands.moderation.kick.success.description = Ich habe %extra% erfolgreich gekickt. commands.moderation.kick.error.title = Nicht möglich commands.moderation.kick.myself.error.description = Ich kann mich nicht selbst kicken\! commands.moderation.kick.yourself.error.description = Du kannst dich nicht selbst kicken. -- 2.45.3 From 29a1b3947d69ac7ed3de9dda782c1a2e0be18cfe Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 20:17:05 +0100 Subject: [PATCH 32/49] Remove Link command strings --- src/main/resources/Translations/Translations_en.properties | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 8544d79..67a2706 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -118,13 +118,6 @@ commands.moderation.kick.yourself.error.description = You can't kick yourself. commands.moderation.kick.mass.success.description = I successfully kicked %extra% Members\! commands.moderation.kick.help.description = Kicks one or more user from the server. commands.moderation.kick.masskick.success.description = I successfully kicked %extra% members. -commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title = Wait that's illegal. -commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title = ) wants to link guilds\! -commands.moderation.link.request.accept.description = React with the reactions to accept or decline it -commands.moderation.link.set.title = Set the thing boi -commands.moderation.link.help.description = Links two or more servers. commands.moderation.nick.success.title = %extra% Successfully nicked %extra% commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. -- 2.45.3 From d462b0822dce334a8ba42edc25738684b5ed8473 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 20:28:00 +0100 Subject: [PATCH 33/49] Fix --- .../com/bbn/hadder/audio/AudioManager.java | 26 ++++++++++++------- .../hadder/commands/music/PlayCommand.java | 15 ++++++++--- .../hadder/commands/music/StopCommand.java | 6 ++--- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 60db2f8..9f54aab 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -6,6 +6,7 @@ import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; @@ -23,19 +24,24 @@ import java.util.concurrent.TimeUnit; public class AudioManager { - public static final Map> players = new HashMap<>(); - public static final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); - public static void loadTrack(String identifier, CommandEvent event, Message msg) { + public AudioManager() { + AudioSourceManagers.registerRemoteSources(myManager); + } + + public final Map> players = new HashMap<>(); + public final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); + + public void loadTrack(String identifier, CommandEvent event, Message msg) { Guild guild = event.getGuild(); - AudioManager.getPlayer(guild); + getPlayer(guild); myManager.loadItemOrdered(guild, identifier, new AudioLoadResultHandler() { @Override public void trackLoaded(AudioTrack track) { - AudioManager.getTrackManager(guild).queue(track, event.getMember()); + getTrackManager(guild).queue(track, event.getMember()); msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.success.loading.title", "⏯", "", "") @@ -56,7 +62,7 @@ public class AudioManager { trackLoaded(playlist.getTracks().get(0)); } else { for (int i = 0; i < Math.min(playlist.getTracks().size(), 200); i++) { - AudioManager.getTrackManager(guild).queue(playlist.getTracks().get(i), event.getMember()); + getTrackManager(guild).queue(playlist.getTracks().get(i), event.getMember()); } } } @@ -79,11 +85,11 @@ public class AudioManager { }); } - public static boolean hasPlayer(Guild guild) { + public boolean hasPlayer(Guild guild) { return players.containsKey(guild.getId()); } - public static AudioPlayer getPlayer(Guild guild) { + public AudioPlayer getPlayer(Guild guild) { AudioPlayer p; if (hasPlayer(guild)) { p = players.get(guild.getId()).getKey(); @@ -93,11 +99,11 @@ public class AudioManager { return p; } - public static TrackManager getTrackManager(Guild guild) { + public TrackManager getTrackManager(Guild guild) { return players.get(guild.getId()).getValue(); } - public static AudioPlayer createPlayer(Guild guild) { + public AudioPlayer createPlayer(Guild guild) { AudioPlayer nPlayer = myManager.createPlayer(); TrackManager manager = new TrackManager(nPlayer); nPlayer.addListener(manager); diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 37854d0..a4b8019 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -1,13 +1,17 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.audio.AudioManager; +import com.bbn.hadder.audio.TrackManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; import net.dv8tion.jda.api.entities.Message; import java.net.URL; - +import java.util.*; /** * @author Skidder / GregTCLTK @@ -15,10 +19,14 @@ import java.net.URL; public class PlayCommand implements Command { + private final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); + public final Map> players = new HashMap<>(); + /* private static final String CD = "\uD83D\uDCBF"; private static final String MIC = "\uD83C\uDFA4 **|>** "; */ + @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { @@ -29,12 +37,12 @@ public class PlayCommand implements Command { Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.load.title", "⭕", "commands.music.play.load.description", "").build()).complete(); - AudioManager.loadTrack(input, event, msg); + new AudioManager().loadTrack(input, event, msg); } catch (Exception ignore) { Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.load.title", "⏯", "commands.music.play.load.description", "").build()).complete(); - AudioManager.loadTrack("ytsearch: " + input, event, msg); + new AudioManager().loadTrack("ytsearch: " + input, event, msg); } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( @@ -45,6 +53,7 @@ public class PlayCommand implements Command { } } else event.getHelpCommand().sendHelp(this, event); + /* OUTSOURCE THIS Guild guild = event.getGuild(); if (args.length == 1) { diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index 1adeb88..ab03799 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -13,9 +13,9 @@ public class StopCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - AudioManager.players.remove(event.getGuild().getId()); - AudioManager.getPlayer(event.getGuild()).destroy(); - AudioManager.getTrackManager(event.getGuild()).purgeQueue(); + new AudioManager().players.remove(event.getGuild().getId()); + new AudioManager().getPlayer(event.getGuild()).destroy(); + new AudioManager().getTrackManager(event.getGuild()).purgeQueue(); event.getGuild().getAudioManager().closeAudioConnection(); event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.stop.success.title", -- 2.45.3 From 7bc151fc48c6f8f06f02b3f97a15ec7d49136f8c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 20:30:36 +0100 Subject: [PATCH 34/49] Removed unused imports --- .../com/bbn/hadder/commands/music/PlayCommand.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index a4b8019..118b7a2 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -1,17 +1,12 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.audio.AudioManager; -import com.bbn.hadder.audio.TrackManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; -import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; import net.dv8tion.jda.api.entities.Message; import java.net.URL; -import java.util.*; /** * @author Skidder / GregTCLTK @@ -19,9 +14,6 @@ import java.util.*; public class PlayCommand implements Command { - private final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); - public final Map> players = new HashMap<>(); - /* private static final String CD = "\uD83D\uDCBF"; private static final String MIC = "\uD83C\uDFA4 **|>** "; */ @@ -40,7 +32,7 @@ public class PlayCommand implements Command { new AudioManager().loadTrack(input, event, msg); } catch (Exception ignore) { Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.play.load.title", "⏯", + "commands.music.play.load.title", "⭕", "commands.music.play.load.description", "").build()).complete(); new AudioManager().loadTrack("ytsearch: " + input, event, msg); } -- 2.45.3 From 49c5e8688bfe3b608187df23f405f53315a6ccdc Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 20:30:42 +0100 Subject: [PATCH 35/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 6f4a5e8..f2820c2 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -34,8 +34,8 @@ commands.general.about.success.description = Hadder is an open source Discord bo commands.general.about.success.field.one.title = Support the Developers commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% commands.general.about.help.description = Shows informations about Hadder. -commands.general.equals.string.first.request = Please send me the first String -commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.first.request = Please send me the first String. +commands.general.equals.string.second.request = Please send me the second String. commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. commands.general.equals.string.first = First String -- 2.45.3 From 8d2bb6162ee7a9f4f8e77823bf44767f7511eaac Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 20:40:40 +0100 Subject: [PATCH 36/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index f2820c2..825d093 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -32,7 +32,7 @@ commands.fun.clyde.help.description = Sends a message as a webhook named Clyde. commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers -commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it if you donated some money to us. Click [here]%extra% to donate. commands.general.about.help.description = Shows informations about Hadder. commands.general.equals.string.first.request = Please send me the first String. commands.general.equals.string.second.request = Please send me the second String. -- 2.45.3 From 6ea63342af2e49790ace0678f66c38a0d50c395d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 20:48:11 +0100 Subject: [PATCH 37/49] Outsource yk --- src/main/java/com/bbn/hadder/Hadder.java | 1 + .../hadder/commands/music/PlayCommand.java | 20 +-------- .../hadder/commands/music/QueueCommand.java | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/QueueCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 9fbd153..c9c2f77 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -91,6 +91,7 @@ public class Hadder { new ClydeCommand(), new PlayCommand(), new StarBoardCommand(), + new QueueCommand(), new StopCommand()), config, helpCommand); builder.addEventListeners( diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 118b7a2..bae30df 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -18,7 +18,6 @@ public class PlayCommand implements Command { private static final String CD = "\uD83D\uDCBF"; private static final String MIC = "\uD83C\uDFA4 **|>** "; */ - @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { @@ -48,9 +47,6 @@ public class PlayCommand implements Command { /* OUTSOURCE THIS Guild guild = event.getGuild(); - if (args.length == 1) { - switch (args[0].toLowerCase()) { - case "info": if (!hasPlayer(guild) || getPlayer(guild).getPlayingTrack() == null) { // No song is playing event.getTextChannel().sendMessage("No song is being played at the moment! *It's your time to shine..*").queue(); } else { @@ -59,21 +55,7 @@ public class PlayCommand implements Command { "\n\u23F1 **|>** `[ " + getTimestamp(track.getPosition()) + " / " + getTimestamp(track.getInfo().length) + " ]`", "\n" + MIC, getOrNull(track.getInfo().author), "\n\uD83C\uDFA7 **|>** " + "")).queue(); - } - break; - - case "queue": - if (!hasPlayer(guild) || getTrackManager(guild).getQueuedTracks().isEmpty()) { - event.getTextChannel().sendMessage("The queue is empty! Load a song with **" - + "dd" + "music play**!").queue(); - } else { - StringBuilder sb = new StringBuilder(); - Set queue = getTrackManager(guild).getQueuedTracks(); - queue.forEach(audioInfo -> sb.append(buildQueueMessage(audioInfo))); - } - break; - } - } */ + }*/ } diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java new file mode 100644 index 0000000..8756e38 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -0,0 +1,42 @@ +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.audio.AudioInfo; +import com.bbn.hadder.audio.AudioManager; +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; + +import java.util.Set; + +/** + * @author Skidder / GregTCLTK + */ + +public class QueueCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + if (!new AudioManager().hasPlayer(event.getGuild()) || new AudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) { + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "", "").build()).queue(); + } else { + Set queue = new AudioManager().getTrackManager(event.getGuild()).getQueuedTracks(); + // Insert message here + } + } + + @Override + public String[] labels() { + return new String[]{"queue"}; + } + + @Override + public String description() { + return "Shows the music queue."; + } + + @Override + public String usage() { + return ""; + } +} -- 2.45.3 From 78511f9b3e100d3222bd6f6aabc5afb5f404cf42 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 21:00:40 +0100 Subject: [PATCH 38/49] 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 825d093..0a5cf44 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -44,11 +44,11 @@ commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.description = Shows each command or explains its usage. commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! commands.general.invite.success.description = [Invite me here\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.invite.help.description = Shows the invitation link to invite Hadder to your server. commands.general.ping.help.description = Shows the ping to the Discord API commands.misc.feedback.title.request.title = Feedback Topic @@ -56,7 +56,7 @@ commands.misc.feedback.title.request.description = Please send me the feedback t 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.success.title = Feedback successfully sent\! commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio -- 2.45.3 From 60cc08daf849d96f7e870aee2de450df4c1ffaa9 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 21:10:44 +0100 Subject: [PATCH 39/49] 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 0a5cf44..4ce8379 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -33,7 +33,7 @@ commands.general.about.success.title = Hadder - About commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.field.one.title = Support the Developers commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it if you donated some money to us. Click [here]%extra% to donate. -commands.general.about.help.description = Shows informations about Hadder. +commands.general.about.help.description = Shows information about Hadder. commands.general.equals.string.first.request = Please send me the first String. commands.general.equals.string.second.request = Please send me the second String. commands.general.equals.string.equals.true = Yes\! The first string equals the second string\! @@ -71,8 +71,8 @@ commands.misc.github.user.error.description = This user does not exist\! commands.misc.github.connect.title = Connect you 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. -commands.misc.screenshare.success.title = Here's your Url to share your Screen -commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.success.title = Here's your URL to share your Screen +commands.misc.screenshare.id.error.title = Wait. That's illegal. commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel commands.misc.screenshare.channel.error.description = There is more than one channel with this name -- 2.45.3 From 667bc275df06d2faba5516d78ff92b6a1a84bc8d Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 21:20:37 +0100 Subject: [PATCH 40/49] 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 4ce8379..8de8cd4 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -73,9 +73,9 @@ commands.misc.github.connect.description = [Please connect your GitHub account h commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your URL to share your Screen commands.misc.screenshare.id.error.title = Wait. That's illegal. -commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID. \n\nNote\: Make sure the Voice Channel is in this Guild. +commands.misc.screenshare.channel.error.title = Please choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name. commands.misc.screenshare.number.error.title = You specified a wrong number\! commands.misc.screenshare.number.error.description = This isn't a Number. commands.misc.screenshare.channel.existing.error = Hol' up -- 2.45.3 From 9496307009a433e486ebf65a819f5acc9d7a8467 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 22 Dec 2019 21:31:17 +0100 Subject: [PATCH 41/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 8de8cd4..13b64d4 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -79,7 +79,7 @@ commands.misc.screenshare.channel.error.description = There is more than one cha commands.misc.screenshare.number.error.title = You specified a wrong number\! commands.misc.screenshare.number.error.description = This isn't a Number. commands.misc.screenshare.channel.existing.error = Hol' up -commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is in this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. commands.moderation.ban.success.title = %extra% Successfully banned %extra% -- 2.45.3 From f6d9e7f62455b0dbcc1ac365cc8f94e545b03aee Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 13:50:56 +0100 Subject: [PATCH 42/49] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 413623b..5e6649d 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -10,23 +10,23 @@ username = number = /all prefix = userprefix = -vc-name/id = +vc-name/id = user+nickname = <@Benutzer> region = guildid = -content = +content = error = Fehler none = Nicht angegeben success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar von %extra% -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 = Look for a GIF on Giphy +commands.fun.gif.help.description = Suche nach einem GIF auf Giphy commands.fun.meme.success.title = Dein zufälliges Meme commands.fun.meme.api.error = Die Anfrage an die Meme-API konnte nicht verarbeitet werden. Bitte versuche es später erneut. -commands.fun.meme.help.description = Sends you a random meme. +commands.fun.meme.help.description = Sendet dir einen zufälligen Meme. commands.fun.clyde.help.description = Send a message as a webhook named Clyde. commands.general.about.success.title = Hadder - About -- 2.45.3 From c54929d0ee18127c1ee6500a1e77ad94846dface Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 14:00:50 +0100 Subject: [PATCH 43/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 5e6649d..ea9f4e0 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -27,13 +27,13 @@ commands.fun.gif.help.description = Suche nach einem GIF auf Giphy commands.fun.meme.success.title = Dein zufälliges Meme commands.fun.meme.api.error = Die Anfrage an die Meme-API konnte nicht verarbeitet werden. Bitte versuche es später erneut. commands.fun.meme.help.description = Sendet dir einen zufälligen Meme. -commands.fun.clyde.help.description = Send a message as a webhook named Clyde. +commands.fun.clyde.help.description = Sendet eine Nachricht als Webhook namens Clyde. -commands.general.about.success.title = Hadder - About -commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.title = Hadder - Info +commands.general.about.success.description = Hadder ist ein Open-Source-Discord Bot. commands.general.about.success.field.one.title = Unterstütze die Entwickler commands.general.about.success.field.one.description = Hadder ist für alle völlig kostenlos. Wir würden uns freuen, wenn du [hier]%extra% etwas Geld spenden würdest. -commands.general.about.help.description = Shows infos about Hadder +commands.general.about.help.description = Zeigt Informationen über Hadder commands.general.equals.string.first.request = Bitte sende mir den ersten String commands.general.equals.string.second.request = Bitte sende mir den zweiten String commands.general.equals.string.equals.true = Ja\! Der erste String entspricht dem zweiten String\! @@ -43,11 +43,11 @@ commands.general.equals.string.second = Zweiter String commands.general.equals.string.result = Ergebnis commands.general.equals.help.description = Prüft ob zwei Strings gleich sind commands.general.help.field.usage = Benutzung -commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.error.description = Ich brauche die Links Einbettung 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 = [CommandName] -commands.general.invite.success.title = Invite me\! -commands.general.invite.success.description = [Invite me here\!]%extra% +commands.general.invite.success.title = Lade mich ein\! +commands.general.invite.success.description = [Lade mich hier ein\!]%extra% commands.general.invite.help.description = Shows the invitation to invite Hadder to your server commands.general.ping.help.description = Shows the ping to the Discord API -- 2.45.3 From d9a67f86829a9d574ac5568e47a2bb8b7191b3a4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 14:00:51 +0100 Subject: [PATCH 44/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 13b64d4..e1d6abf 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -44,7 +44,7 @@ commands.general.equals.string.result = Result commands.general.equals.help.description = Check if two strings are the same commands.general.help.field.usage = Usage commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description = Shows each command or explains its usage. +commands.general.help.help.description = Shows each command and explains its usage commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Invite me\! commands.general.invite.success.description = [Invite me here\!]%extra% -- 2.45.3 From 6a44bb7773479f2751a0eec0b782e4e8cc8e7b69 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 14:10:46 +0100 Subject: [PATCH 45/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index ea9f4e0..02f204f 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -48,22 +48,22 @@ commands.general.help.help.description = Zeigt jeden Befehl an und erklärt sein commands.general.help.help.label = [CommandName] commands.general.invite.success.title = Lade mich ein\! commands.general.invite.success.description = [Lade mich hier ein\!]%extra% -commands.general.invite.help.description = Shows the invitation to invite Hadder to your server -commands.general.ping.help.description = Shows the ping to the Discord API +commands.general.invite.help.description = Zeigt die Einladung, um Hadder auf deinen Server einzuladen +commands.general.ping.help.description = Zeigt den Ping zur Discord API -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.title.request.title = Feedback-Thema +commands.misc.feedback.title.request.description = Bitte senden Sie mir das Thema des Feedbacks. +commands.misc.feedback.description.request.title = Feedback-Beschreibung +commands.misc.feedback.description.request.description = Bitte senden Sie mir jetzt die Feedback-Beschreibung. +commands.misc.feedback.help.description = Sendet Feedback direkt an die Entwickler. +commands.misc.feedback.success.title = Feedback erfolgreich gesendet commands.misc.github.link.title = Verbinde dein GitHub Konto -commands.misc.github.success.title = Information about %extra% -commands.misc.github.success.bio = User bio +commands.misc.github.success.title = Informationen über %extra% +commands.misc.github.success.bio = Benutzer-Biographie commands.misc.github.success.location = Standort commands.misc.github.success.website = Webseite -commands.misc.github.success.repositories = Public repositories -commands.misc.github.success.gists = Public gists +commands.misc.github.success.repositories = Öffentliche Repositories +commands.misc.github.success.gists = Öffentliche Gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -- 2.45.3 From 2193105643be1d1450afb30dc1bedf742f9a6ac2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 14:20:42 +0100 Subject: [PATCH 46/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 02f204f..f53cef4 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -10,18 +10,18 @@ username = number = /all prefix = userprefix = -vc-name/id = +vc-name/id = user+nickname = <@Benutzer> region = guildid = -content = +content = error = Fehler none = Nicht angegeben success\! = Erfolgreich\! commands.fun.avatar.success.title = Avatar von %extra% -commands.fun.avatar.help.description = Sendet den Avatar des angegebenen Mitglieds. +commands.fun.avatar.help.description = Sendet den Avatar des angegebenen Benutzers. commands.fun.gif.error.description = Bitte versuche es mit einem anderen Begriff erneut. commands.fun.gif.help.description = Suche nach einem GIF auf Giphy commands.fun.meme.success.title = Dein zufälliges Meme @@ -30,7 +30,7 @@ commands.fun.meme.help.description = Sendet dir einen zufälligen Meme. commands.fun.clyde.help.description = Sendet eine Nachricht als Webhook namens Clyde. commands.general.about.success.title = Hadder - Info -commands.general.about.success.description = Hadder ist ein Open-Source-Discord Bot. +commands.general.about.success.description = Hadder ist ein Open-Source Discord Bot. commands.general.about.success.field.one.title = Unterstütze die Entwickler commands.general.about.success.field.one.description = Hadder ist für alle völlig kostenlos. Wir würden uns freuen, wenn du [hier]%extra% etwas Geld spenden würdest. commands.general.about.help.description = Zeigt Informationen über Hadder @@ -43,7 +43,7 @@ commands.general.equals.string.second = Zweiter String commands.general.equals.string.result = Ergebnis commands.general.equals.help.description = Prüft ob zwei Strings gleich sind commands.general.help.field.usage = Benutzung -commands.general.help.error.description = Ich brauche die Links Einbettung Berechtigung, um das Hilfe-Menü zu senden\! +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 = [CommandName] commands.general.invite.success.title = Lade mich ein\! @@ -53,23 +53,23 @@ commands.general.ping.help.description = Zeigt den Ping zur Discord API commands.misc.feedback.title.request.title = Feedback-Thema commands.misc.feedback.title.request.description = Bitte senden Sie mir das Thema des Feedbacks. -commands.misc.feedback.description.request.title = Feedback-Beschreibung -commands.misc.feedback.description.request.description = Bitte senden Sie mir jetzt die Feedback-Beschreibung. +commands.misc.feedback.description.request.title = Feedback Beschreibung +commands.misc.feedback.description.request.description = Bitte senden Sie mir jetzt die Feedback Beschreibung. commands.misc.feedback.help.description = Sendet Feedback direkt an die Entwickler. commands.misc.feedback.success.title = Feedback erfolgreich gesendet commands.misc.github.link.title = Verbinde dein GitHub Konto commands.misc.github.success.title = Informationen über %extra% -commands.misc.github.success.bio = Benutzer-Biographie +commands.misc.github.success.bio = Biographie commands.misc.github.success.location = Standort commands.misc.github.success.website = Webseite commands.misc.github.success.repositories = Öffentliche Repositories commands.misc.github.success.gists = Öffentliche Gists -commands.misc.github.success.followers = Followers -commands.misc.github.success.following = Following -commands.misc.github.api.error.description = The GitHub API might be down at the moment\! +commands.misc.github.success.followers = Abonnenten +commands.misc.github.success.following = Folgt +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.connect.title = Connect you GH account -commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% +commands.misc.github.connect.title = Verbinde dein GH-Konto +commands.misc.github.connect.description = [Bitte verbinden Sie Ihr GitHub-Konto hier]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Warte, das ist illegal @@ -78,7 +78,7 @@ commands.misc.screenshare.channel.error.title = Bitte wähle einen Sprachkanal commands.misc.screenshare.channel.error.description = There is more than one channel with this name commands.misc.screenshare.number.error.title = You specified a wrong number\! commands.misc.screenshare.number.error.description = This isn't a Number. -commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.error = Warte ma' commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. commands.misc.screenshare.help.description = Shows you the link to share your screen. -- 2.45.3 From 758fee0a57379f7f11f42c87d926c5764ba22169 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 14:20:44 +0100 Subject: [PATCH 47/49] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index e1d6abf..1ffdea2 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -68,14 +68,14 @@ commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following 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.connect.title = Connect you GH account +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. commands.misc.screenshare.success.title = Here's your URL to share your Screen commands.misc.screenshare.id.error.title = Wait. That's illegal. commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID. \n\nNote\: Make sure the Voice Channel is in this Guild. commands.misc.screenshare.channel.error.title = Please choose a Voice Channel -commands.misc.screenshare.channel.error.description = There is more than one channel with this name. +commands.misc.screenshare.channel.error.description = There is more than one channel with this name commands.misc.screenshare.number.error.title = You specified a wrong number\! commands.misc.screenshare.number.error.description = This isn't a Number. commands.misc.screenshare.channel.existing.error = Hol' up -- 2.45.3 From 1954198f717d4a2d8d5f295abf43ea4876a63963 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2019 13:22:04 +0000 Subject: [PATCH 48/49] Bump JDA from 4.0.0_79 to 4.1.0_81 Bumps JDA from 4.0.0_79 to 4.1.0_81. 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 7346825..dbf03e6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ net.dv8tion JDA - 4.0.0_79 + 4.1.0_81 org.json -- 2.45.3 From 9d44db47d0d3e4d103733d05d0b48cd46688c965 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 23 Dec 2019 14:23:46 +0100 Subject: [PATCH 49/49] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index f53cef4..f526cae 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -68,9 +68,9 @@ commands.misc.github.success.followers = Abonnenten commands.misc.github.success.following = Folgt 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.connect.title = Verbinde dein GH-Konto +commands.misc.github.connect.title = Verbinde dein GH Konto commands.misc.github.connect.description = [Bitte verbinden Sie Ihr GitHub-Konto hier]%extra% -commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.github.help.description = Zeigt Informationen über ein GitHub Benutzerprofil an. commands.misc.screenshare.success.title = Here's your Url to share your Screen commands.misc.screenshare.id.error.title = Warte, das ist illegal commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. @@ -109,12 +109,12 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = Die Einladungslink-Erkennung ist auf dieser Guild bereits deaktiviert. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. -commands.moderation.kick.success.title = %extra% hat %extra% erfolgreich gekickt +commands.moderation.kick.success.title = %extra% Erfolgreich gekickt %extra% commands.moderation.kick.success.description = Ich habe %extra% erfolgreich gekickt. commands.moderation.kick.error.title = Nicht möglich commands.moderation.kick.myself.error.description = Ich kann mich nicht selbst kicken\! commands.moderation.kick.yourself.error.description = Du kannst dich nicht selbst kicken. -commands.moderation.kick.mass.success.description = Ich habe erfolgreich 69 Mitglieder gekickt\! +commands.moderation.kick.mass.success.description = Ich habe erfolgreich %extra% Mitglieder gekickt\! commands.moderation.kick.help.description = Wirft einen oder mehrere Benutzer vom Server. commands.moderation.kick.masskick.success.description = Ich habe %extra% Mitglieder erfolgreich gekickt. commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. @@ -143,7 +143,7 @@ commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. commands.moderation.rules.channel.error.title = Kanal konnte nicht gefunden werden commands.moderation.rules.channel.error.description = Ich kann den angegebenen Kanal nicht finden. Bitte starte das Setup erneut. commands.moderation.rules.rules.title = Regeln -commands.moderation.rules.rules.description = Der Kanal wurde erfolgreich auf %extra% gesetzt. Bitte senden Sie mir die Regeln jetzt. +commands.moderation.rules.rules.description = Der Kanal wurde erfolgreich auf %extra% gesetzt. Bitte senden Sie mir jetzt die Regeln. commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Rolle existiert nicht @@ -201,7 +201,7 @@ commands.owner.eval.success.title = Eval Command commands.owner.eval.success.input = Eingabe commands.owner.eval.success.output = Ausgabe commands.owner.eval.success.timing = Timing -commands.owner.eval.help.description = führe den angegebenen Code aus +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. @@ -216,7 +216,7 @@ 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 = Legt die neue primäre Sprache für einen Benutzer fest. +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%`. -- 2.45.3