From b77e99fc7dd6dc6ba408cba3cf437241c553f929 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 31 Dec 2019 14:47:11 +0100 Subject: [PATCH 1/5] Unused imports --- src/main/java/com/bbn/hadder/commands/general/HelpCommand.java | 1 - src/main/java/com/bbn/hadder/commands/owner/TestCommand.java | 1 - src/main/java/com/bbn/hadder/utils/MessageEditor.java | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 529cdf7..8da4db5 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -9,7 +9,6 @@ import net.dv8tion.jda.api.Permission; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import java.util.Optional; public class HelpCommand implements Command { diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java index 64633f2..3473085 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -2,7 +2,6 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.utils.MessageEditor.MessageType; /* diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 47fc105..1d39039 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -1,7 +1,6 @@ package com.bbn.hadder.utils; import com.bbn.hadder.Rethink; -import com.bbn.hadder.commands.CommandEvent; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; -- 2.45.3 From c50176085e23a6efaeaa64a01d3c77bc35768a9e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 13:32:44 +0100 Subject: [PATCH 2/5] Volume command fixes --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index b0391b9..6c96512 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -16,7 +16,7 @@ public class VolumeCommand implements Command { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { try { int volume = Integer.parseInt(args[0]); - if (volume < 200 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getId())) { + if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) { event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume); event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.volume.success.title", "", -- 2.45.3 From 5ef680e020c4db2145780cffa5f644af61e68fc0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 13:35:08 +0100 Subject: [PATCH 3/5] Translation fix --- src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index 6c96512..d0d058b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -46,7 +46,7 @@ public class VolumeCommand implements Command { @Override public String description() { - return "Change the volume of the music."; + return "commands.music.volume.help.description"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 133e2e9..7cfb99e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -212,6 +212,7 @@ commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From accb85661aa5c4e69a2fe95a14560f131bbd2757 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 14:32:42 +0100 Subject: [PATCH 4/5] VoiceLeaveListener fix --- src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java index 643a17a..8db4d9f 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -18,7 +18,7 @@ public class VoiceLeaveListener extends ListenerAdapter { @Override public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) { - if (new AudioManager().hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) { + if (audioManager.hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) { audioManager.players.remove(event.getGuild().getId()); audioManager.getPlayer(event.getGuild()).destroy(); audioManager.getTrackManager(event.getGuild()).purgeQueue(); -- 2.45.3 From 6c7445ad3209b9cd49c46ecbf5ccf0648d388b5b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2020 13:46:21 +0000 Subject: [PATCH 5/5] Bump JDA from 4.1.0_88 to 4.1.0_90 Bumps JDA from 4.1.0_88 to 4.1.0_90. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 920716f..79ee1d3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ net.dv8tion JDA - 4.1.0_88 + 4.1.0_90 org.json -- 2.45.3