From b3784dea1045f7334eb926c5833ab646ab111cc6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 15 Feb 2020 19:11:37 +0100 Subject: [PATCH 01/28] So much better --- .../hadder/audio/AudioPlayerSendHandler.java | 3 +- .../hadder/commands/music/EchoCommand.java | 47 ++----------------- 2 files changed, 7 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java index cdbda28..17b49f9 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java +++ b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java @@ -18,12 +18,13 @@ 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.AudioReceiveHandler; import net.dv8tion.jda.api.audio.AudioSendHandler; import javax.annotation.Nullable; import java.nio.ByteBuffer; -public class AudioPlayerSendHandler implements AudioSendHandler { +public class AudioPlayerSendHandler implements AudioSendHandler, AudioReceiveHandler { private final AudioPlayer audioPlayer; private AudioFrame lastFrame; diff --git a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java index 268498b..6e8cde2 100644 --- a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java @@ -16,68 +16,31 @@ package com.bbn.hadder.commands.music; +import com.bbn.hadder.audio.AudioPlayerSendHandler; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; -import net.dv8tion.jda.api.audio.*; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.managers.AudioManager; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.nio.ByteBuffer; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; - @Perms(Perm.BOT_OWNER) public class EchoCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - Guild guild = event.getMember().getVoiceState().getChannel().getGuild(); + public void executed(String[] args, CommandEvent e) { + Guild guild = e.getMember().getVoiceState().getChannel().getGuild(); AudioManager audioManager = guild.getAudioManager(); - EchoHandler handler = new EchoHandler(); + AudioPlayerSendHandler handler = new AudioPlayerSendHandler(e.getAudioManager().getPlayer(e.getGuild())); if (!audioManager.isConnected()) { audioManager.setSendingHandler(handler); audioManager.setReceivingHandler(handler); - audioManager.openAudioConnection(event.getMember().getVoiceState().getChannel()); + audioManager.openAudioConnection(e.getMember().getVoiceState().getChannel()); } else { audioManager.closeAudioConnection(); } } - public static class EchoHandler implements AudioSendHandler, AudioReceiveHandler { - - private final Queue queue = new ConcurrentLinkedQueue<>(); - - @Override - public boolean canProvide() { - return !queue.isEmpty(); - } - - @Nullable - @Override - public ByteBuffer provide20MsAudio() { - byte[] data = queue.poll(); - return data == null ? null : ByteBuffer.wrap(data); // Wrap this in a java.nio.ByteBuffer - } - - @Override - public boolean canReceiveCombined() { - return queue.size() < 10; - } - - @Override - public void handleCombinedAudio(@Nonnull CombinedAudio combinedAudio) { - if (combinedAudio.getUsers().isEmpty()) - return; - - byte[] data = combinedAudio.getAudioData(1.0f); // volume at 100% = 1.0 (50% = 0.5 / 55% = 0.55) - queue.add(data); - } - } - @Override public String[] labels() { return new String[]{"echo"}; -- 2.45.3 From 18b8a86a7ddf1f6443008b2b8712ab108972caad Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 15 Feb 2020 19:19:30 +0100 Subject: [PATCH 02/28] Echo command --- src/main/java/com/bbn/hadder/commands/music/EchoCommand.java | 5 +---- src/main/resources/Translations/Translations_en.properties | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java index 6e8cde2..d18e2b9 100644 --- a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java @@ -19,12 +19,9 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.audio.AudioPlayerSendHandler; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.core.Perm; -import com.bbn.hadder.core.Perms; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.managers.AudioManager; -@Perms(Perm.BOT_OWNER) public class EchoCommand implements Command { @Override @@ -48,7 +45,7 @@ public class EchoCommand implements Command { @Override public String description() { - return null; + return "commands.music.echo.help.description"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 75aaadd..bc7d33b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -276,6 +276,7 @@ commands.music.loop.success.unloop.description = I will no longer repeat the cur commands.music.loop.error.connected.title = No channel commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. commands.music.loop.help.description = Repeats a song/queue. +commands.music.echo.help.description = Sends your voice through Hadder. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From af7c114970a93d0b067572c44d588c2184b046bd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 15 Feb 2020 20:58:00 +0100 Subject: [PATCH 03/28] :^) --- .../bbn/hadder/commands/music/EchoCommand.java | 1 - .../bbn/hadder/commands/music/RecordCommand.java | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java index d18e2b9..35beaf4 100644 --- a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java @@ -57,5 +57,4 @@ public class EchoCommand implements Command { public String example() { return null; } - } diff --git a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java index 48339ed..95ca154 100644 --- a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java @@ -1,5 +1,17 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder.commands.music; @@ -83,7 +95,7 @@ public class RecordCommand implements Command { @Override public String[] labels() { - return new String[]{"echo"}; + return new String[]{"record"}; } @Override -- 2.45.3 From bf6ff1954cce37da4edefd0a25a6c6b1f067f115 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 15 Feb 2020 21:09:37 +0100 Subject: [PATCH 04/28] fix --- src/main/java/com/bbn/hadder/commands/music/SkipCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index 9500988..be1a5b1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -33,7 +33,7 @@ public class SkipCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.skip.error.connected.title", - "commands.music.skip.error.connected.description ").build()).queue(); + "commands.music.skip.error.connected.description").build()).queue(); } } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, -- 2.45.3 From b5b18ac5251e23e04a06c00ccdd5b619d399fede Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 00:22:43 +0100 Subject: [PATCH 05/28] Better stuff --- .../com/bbn/hadder/audio/AudioManager.java | 36 +++++++++++++------ .../Translations/Translations_en.properties | 1 + 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index fe45e59..363581c 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -76,17 +76,31 @@ public class AudioManager { @Override public void trackLoaded(AudioTrack track) { - 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(); + if (getTrackManager(guild).getQueuedTracks().isEmpty()) { + 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(); + } else { + getTrackManager(guild).queue(track, event.getMember()); + msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.success.queueing.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 diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index bc7d33b..a96bbb3 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -223,6 +223,7 @@ commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% +commands.music.play.success.queueing.title = %extra% Added to queue %extra% commands.music.play.success.title = Title commands.music.play.success.author = Author commands.music.play.success.length = Length -- 2.45.3 From a46e2249c60b56527c34b99bb8cc160b23d27988 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 00:27:16 +0100 Subject: [PATCH 06/28] prevent error message --- src/main/java/com/bbn/hadder/listener/InviteLinkListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index 88aa3ee..d0e9011 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -41,8 +41,8 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent e) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.isFromType(ChannelType.TEXT)) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { checkInvite(e.getMessage(), "discord.gg/"); } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { -- 2.45.3 From 0b4ace9c80f9965c8dfbac8ca88eb87a68fe9e1b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 00:34:28 +0100 Subject: [PATCH 07/28] Rename is to has --- src/main/java/com/bbn/hadder/RethinkServer.java | 2 +- .../hadder/commands/moderation/InviteDetectCommand.java | 4 ++-- .../java/com/bbn/hadder/listener/InviteLinkListener.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index c15c448..5036dbb 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -68,7 +68,7 @@ public class RethinkServer { return id; } - public boolean isInviteDetect() { + public boolean hasInviteDetect() { return invite_detect; } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index faad4da..5205372 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -31,7 +31,7 @@ public class InviteDetectCommand implements Command { String opinion = args[0].toLowerCase(); switch (opinion) { case "on": - if (!e.getRethinkServer().isInviteDetect()) { + if (!e.getRethinkServer().hasInviteDetect()) { e.getRethinkServer().setInviteDetect(true); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( @@ -50,7 +50,7 @@ public class InviteDetectCommand implements Command { break; case "off": - if (e.getRethinkServer().isInviteDetect()) { + if (e.getRethinkServer().hasInviteDetect()) { e.getRethinkServer().setInviteDetect(false); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index d0e9011..ef40e4b 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -43,9 +43,9 @@ public class InviteLinkListener extends ListenerAdapter { public void onMessageReceived(@Nonnull MessageReceivedEvent e) { if (e.isFromType(ChannelType.TEXT)) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect())) { checkInvite(e.getMessage(), "discord.gg/"); - } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { checkInvite(e.getMessage(), "discordapp.com/invite/"); } } @@ -71,9 +71,9 @@ public class InviteLinkListener extends ListenerAdapter { public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.isFromType(ChannelType.TEXT)) { - if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect()) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { checkInvite(e.getMessage(), "discord.gg/"); - } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect()) { + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { checkInvite(e.getMessage(), "discordapp.com/invite/"); } } -- 2.45.3 From a533de3dd147e85b7fd887c83db993982b742256 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 00:35:04 +0100 Subject: [PATCH 08/28] prevent error message --- src/main/java/com/bbn/hadder/listener/InviteLinkListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index ef40e4b..ea00e93 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -69,8 +69,8 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.isFromType(ChannelType.TEXT)) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { checkInvite(e.getMessage(), "discord.gg/"); } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { -- 2.45.3 From f26484b13b0d79844dedca160876f1165fe144f3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 01:01:15 +0100 Subject: [PATCH 09/28] m --- src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java | 3 ++- 1 file changed, 2 insertions(+), 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 d53391f..7c00c2a 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -30,7 +30,8 @@ public class VoiceLeaveListener extends ListenerAdapter { @Override public void onGuildVoiceLeave(GuildVoiceLeaveEvent e) { - if (audioManager.hasPlayer(e.getGuild()) && e.getChannelLeft().getMembers().equals(e.getGuild().getSelfMember())) { + System.out.println(e.getChannelJoined()); + if (audioManager.hasPlayer(e.getGuild()) && e.getChannelLeft().getMembers().get(0).equals(e.getGuild().getSelfMember())) { audioManager.players.remove(e.getGuild().getId()); audioManager.getPlayer(e.getGuild()).destroy(); audioManager.getTrackManager(e.getGuild()).purgeQueue(); -- 2.45.3 From 578ee5bdc19466e1ba0884365a2bbbde8038849d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 11:53:49 +0100 Subject: [PATCH 10/28] Add South Korean voice region --- .../hadder/commands/moderation/RegionChangeCommand.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index 59c7a0d..5e7efcf 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -86,17 +86,16 @@ public class RegionChangeCommand implements Command { case "us-south": setRegion(Region.US_SOUTH, "US South", e); break; - /*case "south-korea": + case "south-korea": setRegion(Region.SOUTH_KOREA, "South Korea", e); break; - TODO: Publish when JDA v4.2.0 is released*/ default: e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.regionchange.regions.title", "") - .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") + .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london` `south korea`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") .build()).queue(); break; } @@ -124,7 +123,7 @@ public class RegionChangeCommand implements Command { @Override public String[] labels() { - return new String[]{"changeregion", "cr", "change-region"}; + return new String[]{"changeregion", "cr", "change-region", "region"}; } @Override -- 2.45.3 From a5e3c2a84f4c60136fb6ca45dfc050e5f85ac35b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 11:58:33 +0100 Subject: [PATCH 11/28] Update version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7548e0f..aa6b8a5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.0.3 + 1.1.0 Hadder -- 2.45.3 From 0940478cd7afda40950f99c2d541d275869d049e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 12:07:12 +0100 Subject: [PATCH 12/28] vll --- src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java index 7c00c2a..753cf7f 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -30,8 +30,7 @@ public class VoiceLeaveListener extends ListenerAdapter { @Override public void onGuildVoiceLeave(GuildVoiceLeaveEvent e) { - System.out.println(e.getChannelJoined()); - if (audioManager.hasPlayer(e.getGuild()) && e.getChannelLeft().getMembers().get(0).equals(e.getGuild().getSelfMember())) { + if (!e.getMember().getUser().isBot() && audioManager.hasPlayer(e.getGuild()) && e.getChannelLeft().getMembers().size() == 1 && e.getChannelLeft().getMembers().get(0).equals(e.getGuild().getSelfMember())) { audioManager.players.remove(e.getGuild().getId()); audioManager.getPlayer(e.getGuild()).destroy(); audioManager.getTrackManager(e.getGuild()).purgeQueue(); -- 2.45.3 From cab29c3340d1d931a7fcd5d626bc2298d6c1cc5b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 12:42:16 +0100 Subject: [PATCH 13/28] Unused --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index bb4141f..32ab5e1 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -98,8 +98,4 @@ public class TrackManager extends AudioEventAdapter { { this.loop = repeating; } - - public AudioInfo getTrackInfo(AudioTrack track) { - return queue.stream().filter(audioInfo -> audioInfo.getTrack().equals(track)).findFirst().orElse(null); - } } -- 2.45.3 From ec6c8c752701575af86ebbd52489576f344a54cf Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 15:10:46 +0100 Subject: [PATCH 14/28] moving vlog #2 --- src/main/java/com/bbn/hadder/Rethink.java | 12 +++--------- src/main/java/com/bbn/hadder/RethinkServer.java | 4 ++++ .../com/bbn/hadder/commands/owner/EvalCommand.java | 1 - .../com/bbn/hadder/listener/StarboardListener.java | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 29b8346..aeaaf58 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -136,23 +136,18 @@ public class Rethink { .with("blacklisted", "none")); } - // TODO - public boolean hasStarboardChannel(String guild_id) { - return !this.getByID("server", guild_id, "starboard").equals(""); - } - // TODO public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) { this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboard_message_id)); } - // TODO + public String getStarboardMessage(String message_id) { return (String) this.getByID("stars", message_id, "starboardmsg"); } - // TODO + public void removeStarboardMessage(String message_id) { this.remove("stars", "id", message_id); } - // TODO + public boolean hasStarboardMessage(String message_id) { try { this.getByID("stars", message_id, "guild"); @@ -162,7 +157,6 @@ public class Rethink { } } - public void pushServer(RethinkServer server) { JSONObject object = new JSONObject(); for (Field field : server.getClass().getDeclaredFields()) { diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 5036dbb..5a506db 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -116,6 +116,10 @@ public class RethinkServer { this.starboard = starboard; } + public boolean hasStarboardChannel() { + return !starboard.equals(""); + } + public void updateRules(String message_id, String role_id, String accept_emote, String decline_emote) { this.setMessageID(message_id); this.setRoleID(role_id); diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index 5b5f512..f573ce5 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -43,7 +43,6 @@ public class EvalCommand implements Command { } catch (ScriptException ex) { ex.printStackTrace(); } - engine.put("msg".toLowerCase(), e.getMessage()); engine.put("shardmanager".toLowerCase(), Hadder.shardManager); engine.put("rethink".toLowerCase(), e.getRethink()); diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index ba66f81..2467ad5 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -50,7 +50,7 @@ public class StarboardListener extends ListenerAdapter { if (e.getReaction().getReactionEmote().getName().equals("⭐")) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (!rethink.hasStarboardMessage(e.getMessageId())) { - if (rethink.hasStarboardChannel(e.getGuild().getId())) { + if (rethinkServer.hasStarboardChannel()) { e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( msg -> { int stars = 0; -- 2.45.3 From dc3a2ca96a45e6e94a9960eacc151bf38879581a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 16 Feb 2020 14:12:37 +0000 Subject: [PATCH 15/28] Bump rethinkdb-driver from 2.3.3 to 2.4.0 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.3.3 to 2.4.0. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/commits/v2.4.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa6b8a5..46d460e 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.rethinkdb rethinkdb-driver - 2.3.3 + 2.4.0 org.slf4j -- 2.45.3 From 0b281a20ac03d934521839ad53555915f6087432 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 20:23:04 +0100 Subject: [PATCH 16/28] Fix some stuff --- .../com/bbn/hadder/audio/TrackManager.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 32ab5e1..669f32c 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -63,17 +63,19 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - Guild g = queue.poll().getAuthor().getGuild(); - this.lastTrack = track; if (loop) { + this.lastTrack = track; player.playTrack(lastTrack.makeClone()); - } else if (queue.isEmpty()) { - manager.players.remove(g.getId()); - manager.getPlayer(g).destroy(); - manager.getTrackManager(g).purgeQueue(); - g.getAudioManager().closeAudioConnection(); } else { - player.playTrack(queue.element().getTrack()); + Guild g = queue.poll().getAuthor().getGuild(); + manager.getPlayer(g).stopTrack(); + if (!queue.isEmpty()) player.playTrack(queue.element().getTrack().makeClone()); + else { + manager.players.remove(g.getId()); + manager.getPlayer(g).destroy(); + manager.getTrackManager(g).purgeQueue(); + g.getAudioManager().closeAudioConnection(); + } } } -- 2.45.3 From 91d146f68bee3556c60bf528cf5f999659300c53 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 20:29:36 +0100 Subject: [PATCH 17/28] Use explicit scoping --- .../java/com/bbn/hadder/RethinkServer.java | 18 +++++++++--------- src/main/java/com/bbn/hadder/RethinkUser.java | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 5a506db..5e6c5aa 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -24,15 +24,15 @@ public class RethinkServer { private Rethink rethink; - String accept_emote = ""; - String decline_emote = ""; - String id; - boolean invite_detect = false; - String message_id = ""; - String neededstars = "3"; - String prefix = "h."; - String role_id = ""; - String starboard = ""; + public String accept_emote = ""; + public String decline_emote = ""; + public String id; + public boolean invite_detect = false; + public String message_id = ""; + public String neededstars = "3"; + public String prefix = "h."; + public String role_id = ""; + public String starboard = ""; public RethinkServer(JSONObject object, Rethink rethink) { for (Field field : this.getClass().getDeclaredFields()) { diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index 1d99ac5..cc3b41d 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -24,10 +24,10 @@ public class RethinkUser { private Rethink rethink; - String id; - String prefix = "h."; - String language = "en"; - String blacklisted = "none"; + public String id; + public String prefix = "h."; + public String language = "en"; + public String blacklisted = "none"; public RethinkUser(JSONObject object, Rethink rethink) { for (Field field : this.getClass().getDeclaredFields()) { -- 2.45.3 From 2a0bff749a41b3ba0375ac36bd6fb093d8e01eac Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 16 Feb 2020 20:31:49 +0100 Subject: [PATCH 18/28] Codacy --- src/main/java/com/bbn/hadder/RethinkServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 5e6c5aa..200e13a 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -117,7 +117,7 @@ public class RethinkServer { } public boolean hasStarboardChannel() { - return !starboard.equals(""); + return !"".equals(starboard); } public void updateRules(String message_id, String role_id, String accept_emote, String decline_emote) { -- 2.45.3 From b9f7493e95db29350af48d5de52ba18e0916af53 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 17 Feb 2020 21:06:45 +0100 Subject: [PATCH 19/28] Fix code command --- src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java index 728a975..450fb64 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java @@ -42,10 +42,9 @@ public class CodeCommand implements Command { .addField("Code", "[" + args[0] + "](https://discord.gg/" + args[0] + ")", true) .addField("Guild Name", json.getJSONObject("guild").getString("name"), true) .addField("Guild ID", json.getJSONObject("guild").getString("id"), true) - .addField("Verification Level", json.getJSONObject("guild").getString("verification_level"), true) + .addField("Verification Level", String.valueOf(json.getJSONObject("guild").getInt("verification_level")), true) .setThumbnail("https://cdn.discordapp.com/icons/" + json.getJSONObject("guild").getString("id") + "/" + json.getJSONObject("guild").getString("icon") + ".png") .build()).queue(); - e.getTextChannel().sendMessage(json.toString()).queue(); } catch (JSONException ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.code.error.title", -- 2.45.3 From 58409100b32488f49a3f563673c9a495df6e475c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 17 Feb 2020 21:09:24 +0100 Subject: [PATCH 20/28] Finish code command --- src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java index 450fb64..a154bb2 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java @@ -41,8 +41,10 @@ public class CodeCommand implements Command { "commands.misc.code.success.description") .addField("Code", "[" + args[0] + "](https://discord.gg/" + args[0] + ")", true) .addField("Guild Name", json.getJSONObject("guild").getString("name"), true) - .addField("Guild ID", json.getJSONObject("guild").getString("id"), true) + .addBlankField(true) .addField("Verification Level", String.valueOf(json.getJSONObject("guild").getInt("verification_level")), true) + .addField("Guild ID", json.getJSONObject("guild").getString("id"), true) + .addBlankField(true) .setThumbnail("https://cdn.discordapp.com/icons/" + json.getJSONObject("guild").getString("id") + "/" + json.getJSONObject("guild").getString("icon") + ".png") .build()).queue(); } catch (JSONException ex) { -- 2.45.3 From 546aed85fd4c7c5b8d1e50027e5a973f83b7d483 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 17 Feb 2020 21:11:44 +0100 Subject: [PATCH 21/28] Add a blank field to h.serverstats --- .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java index 6ea8bbf..009a8a0 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java @@ -43,6 +43,7 @@ public class ServerStatsCommand implements Command { .addField("Member Count", String.valueOf(e.getGuild().getMemberCount()), true) .addField("Explicit Content Level", e.getGuild().getExplicitContentLevel().getKey() + ": " + e.getGuild().getExplicitContentLevel(), true) .addField("Features", e.getGuild().getFeatures().toString().replaceAll("\\[", "`").replaceAll(",", "`, `").replaceAll("]", "`"), true) + .addBlankField(true) .setThumbnail(e.getGuild().getIconUrl()) .setImage(e.getGuild().getBannerUrl()); -- 2.45.3 From 569852042c261e20c3330ba825d4998d7262b20a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 19 Feb 2020 21:01:46 +0100 Subject: [PATCH 22/28] stuff --- .../Translations/Translations_en.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index a96bbb3..f21bac2 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -117,17 +117,17 @@ 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.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.success.description = I successfully set the new prefix for the server 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.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this server. commands.moderation.invitedetect.activate.error.title = Already activated -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this server. commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this server. commands.moderation.invitedetect.deactivate.error.title = Already deactivated -commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this server. 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%. @@ -160,11 +160,11 @@ commands.moderation.rules.rules.description = The channel was successfully set t commands.moderation.rules.role.title = Role to assign/remove commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist -commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.error.description = The specified role does not exist on this server. commands.moderation.rules.role.permission.error.title = No permission commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild -commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! +commands.moderation.rules.guild.error.description = The mentioned channel must be on this server\! 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. commands.moderation.rules.emote.decline.title = Custom Decline Emote @@ -305,8 +305,8 @@ commands.owner.eval.help.description = Execute the given code 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.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.guildleave.error.description = I can not leave from this server. Maybe this isn't a ID? +commands.owner.guildleave.help.description = Quit from a server commands.owner.reboot.help.description = Restart the bot commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down -- 2.45.3 From c53e8164f12930c1b99e8b150aa45957aec4983e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 20 Feb 2020 20:15:46 +0100 Subject: [PATCH 23/28] Fix the echo command --- .../hadder/audio/AudioPlayerSendHandler.java | 43 +++++++++++++++---- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java index 17b49f9..eb4f330 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java +++ b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java @@ -20,14 +20,18 @@ import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame; import net.dv8tion.jda.api.audio.AudioReceiveHandler; import net.dv8tion.jda.api.audio.AudioSendHandler; +import net.dv8tion.jda.api.audio.CombinedAudio; import javax.annotation.Nullable; import java.nio.ByteBuffer; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; public class AudioPlayerSendHandler implements AudioSendHandler, AudioReceiveHandler { private final AudioPlayer audioPlayer; private AudioFrame lastFrame; + private final Queue queue = new ConcurrentLinkedQueue<>(); public AudioPlayerSendHandler(AudioPlayer audioPlayer) { this.audioPlayer = audioPlayer; @@ -35,28 +39,49 @@ public class AudioPlayerSendHandler implements AudioSendHandler, AudioReceiveHan @Override public boolean canProvide() { - if (lastFrame == null) { + if (audioPlayer.getPlayingTrack() == null) + return !queue.isEmpty(); + else if (lastFrame == null) { lastFrame = audioPlayer.provide(); + return lastFrame != null; } - - return lastFrame != null; + return false; } @Nullable @Override public ByteBuffer provide20MsAudio() { - if (lastFrame == null) { - lastFrame = audioPlayer.provide(); + if (audioPlayer.getPlayingTrack() == null) { + byte[] data = queue.poll(); + return data == null ? null : ByteBuffer.wrap(data); + } else { + if (lastFrame == null) { + lastFrame = audioPlayer.provide(); + } + + byte[] data = lastFrame != null ? lastFrame.getData() : null; + lastFrame = null; + + return ByteBuffer.wrap(data); } + } - byte[] data = lastFrame != null ? lastFrame.getData() : null; - lastFrame = null; + @Override + public boolean canReceiveCombined() { + return queue.size() < 10; + } - return ByteBuffer.wrap(data); + @Override + public void handleCombinedAudio(CombinedAudio combinedAudio) { + if (combinedAudio.getUsers().isEmpty()) + return; + + byte[] data = combinedAudio.getAudioData(1.0f); + queue.add(data); } @Override public boolean isOpus() { - return true; + return audioPlayer.getPlayingTrack() != null; } } -- 2.45.3 From df636bc32b0ccc4a26960c5255330b162875cd3f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 20 Feb 2020 20:18:07 +0100 Subject: [PATCH 24/28] Add echo message --- src/main/java/com/bbn/hadder/commands/music/EchoCommand.java | 5 +++++ src/main/resources/Translations/Translations_en.properties | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java index 35beaf4..3af61a9 100644 --- a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java @@ -19,6 +19,7 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.audio.AudioPlayerSendHandler; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.managers.AudioManager; @@ -33,6 +34,10 @@ public class EchoCommand implements Command { audioManager.setSendingHandler(handler); audioManager.setReceivingHandler(handler); audioManager.openAudioConnection(e.getMember().getVoiceState().getChannel()); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.echo.success.title", + "commands.music.echo.success.description") + .build()).queue(); } else { audioManager.closeAudioConnection(); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index f21bac2..c19c9dc 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -277,6 +277,8 @@ commands.music.loop.success.unloop.description = I will no longer repeat the cur commands.music.loop.error.connected.title = No channel commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. commands.music.loop.help.description = Repeats a song/queue. +commands.music.echo.success.title = Successfully activated +commands.music.echo.success.description = I will now repeat everything I can hear in your voice channel commands.music.echo.help.description = Sends your voice through Hadder. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From a460e3d3ccfc7514629d7085d6a6aec19d10dd64 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 20 Feb 2020 20:29:29 +0100 Subject: [PATCH 25/28] GH action test --- src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 6fd6bb2..a424084 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -112,3 +112,4 @@ public class BanCommand implements Command { return "@Skidder"; } } + -- 2.45.3 From 0f92e0b22e5077b94516f2bc5b44de345e6a3545 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 20 Feb 2020 20:30:48 +0100 Subject: [PATCH 26/28] Bro why is it working now --- src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index a424084..6fd6bb2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -112,4 +112,3 @@ public class BanCommand implements Command { return "@Skidder"; } } - -- 2.45.3 From 40d6a6ab95a21525fa70cf2959cdb628aa7abfcc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 20 Feb 2020 20:46:02 +0100 Subject: [PATCH 27/28] Remove unused perm --- src/main/java/com/bbn/hadder/core/Perm.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/com/bbn/hadder/core/Perm.java index 042412e..0eea910 100644 --- a/src/main/java/com/bbn/hadder/core/Perm.java +++ b/src/main/java/com/bbn/hadder/core/Perm.java @@ -33,12 +33,6 @@ public enum Perm { return e.getMember().hasPermission(Permission.MESSAGE_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, - EMBED_MESSAGES { - @Override - public boolean check(CommandEvent e) { - return e.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); - } - }, BAN_MEMBERS { @Override public boolean check(CommandEvent e) { -- 2.45.3 From 4a7d6ea2d12c7b41946faa775b01dce077fb1e4e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 20 Feb 2020 20:58:15 +0100 Subject: [PATCH 28/28] A lot of better code --- .../bbn/hadder/commands/misc/ScreenShareCommand.java | 4 +--- .../com/bbn/hadder/commands/moderation/BanCommand.java | 4 +--- .../bbn/hadder/commands/moderation/ClearCommand.java | 4 +--- .../commands/moderation/InviteDetectCommand.java | 4 +--- .../bbn/hadder/commands/moderation/KickCommand.java | 4 +--- .../bbn/hadder/commands/moderation/NickCommand.java | 10 +++------- .../bbn/hadder/commands/moderation/PrefixCommand.java | 6 ++---- .../bbn/hadder/commands/moderation/RoleCommand.java | 4 +--- .../hadder/commands/moderation/StarboardCommand.java | 6 ++---- .../com/bbn/hadder/commands/owner/EvalCommand.java | 4 +--- .../bbn/hadder/commands/owner/GuildLeaveCommand.java | 4 +--- .../bbn/hadder/commands/settings/LanguageCommand.java | 4 +--- .../hadder/commands/settings/UserPrefixCommand.java | 4 +--- .../resources/Translations/Translations_en.properties | 2 +- 14 files changed, 18 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index 30265d7..c000356 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -74,9 +74,7 @@ public class ScreenShareCommand implements Command { .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); } } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 6fd6bb2..d179018 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -58,8 +58,6 @@ public class BanCommand implements Command { "commands.moderation.ban.error.title", "commands.moderation.ban.yourself.error.description").build()).queue(); } - } else if (e.getMessage().getMentionedMembers().size() == 0) { - e.getHelpCommand().sendHelp(this, e); } else if (e.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { Member member = e.getMessage().getMentionedMembers().get(i); @@ -89,7 +87,7 @@ public class BanCommand implements Command { "", "commands.moderation.ban.massban.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 9f6fc14..d595aa7 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -92,9 +92,7 @@ public class ClearCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 5205372..bd1e4cd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -69,9 +69,7 @@ public class InviteDetectCommand implements Command { default: e.getHelpCommand().sendHelp(this, e); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 990042f..5784644 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -54,8 +54,6 @@ public class KickCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); } - } else if (e.getMessage().getMentionedMembers().size() == 0) { - e.getHelpCommand().sendHelp(this, e); } else if (e.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { Member member = e.getMessage().getMentionedMembers().get(i); @@ -74,7 +72,7 @@ public class KickCommand implements Command { } } e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 1849238..40415bd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -54,9 +54,7 @@ public class NickCommand implements Command { "commands.moderation.nick.success.description", e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() ).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } @@ -81,9 +79,7 @@ public class NickCommand implements Command { ).build()).queue(); } } - } else if (e.getMessage().getMentionedMembers().size() == 0) { - e.getHelpCommand().sendHelp(this, e); - } else { + } else if (e.getMessage().getMentionedUsers().size() > 1) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { Member member = e.getMessage().getMentionedMembers().get(i); if (!e.getJDA().getSelfUser().getId().equals(member.getId())) { @@ -99,7 +95,7 @@ public class NickCommand implements Command { "✅", "commands.moderation.nick.myself.success.description", String.valueOf(e.getMessage().getMentionedMembers().size()) ).build()).queue(); - } + } else e.getHelpCommand().sendHelp(this, e); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index a6db1db..7b4737b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -34,7 +34,7 @@ public class PrefixCommand implements Command { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.prefix.success.title", - "✅", + "", "commands.moderation.prefix.success.description", args[0]).build() ).queue(); @@ -45,9 +45,7 @@ public class PrefixCommand implements Command { "", "commands.moderation.prefix.error.description").build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 3799f7f..9094bcd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -95,9 +95,7 @@ public class RoleCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override 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 59bdb7b..03629d5 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -39,12 +39,10 @@ public class StarboardCommand implements Command { if (channel!=null) { e.getRethinkServer().setStarboard(channel.getId()); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } - if (args.length==2) { + if (args.length == 2) { e.getRethinkServer().setNeededStars(args[1]); } diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index f573ce5..5d0f8f7 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -96,9 +96,7 @@ public class EvalCommand implements Command { }, 0, TimeUnit.MILLISECONDS); - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 15bc1a9..0db2850 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -41,9 +41,7 @@ public class GuildLeaveCommand implements Command { } catch (Exception ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue(); } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index e09a44a..7c6ab93 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -54,9 +54,7 @@ public class LanguageCommand implements Command { .build()).queue(); break; } - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } public void setLanguage(String language_code, String language, CommandEvent e) { diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index 4b17d3f..3867bb4 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -32,9 +32,7 @@ public class UserPrefixCommand implements Command { .build()) .queue(); e.getRethinkUser().push(); - } else { - e.getHelpCommand().sendHelp(this, e); - } + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index c19c9dc..01d2f6e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -323,6 +323,6 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman 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.prefix.success.title = %extra% Successfully set %extra% +commands.settings.prefix.success.title = Successfully set prefix commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`. commands.settings.prefix.help.description = Sets a new prefix. -- 2.45.3