From 5bba1ab9c3c4bccf5adc62e8ee053ae101d15070 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 19:04:04 +0100 Subject: [PATCH] Rename event to e in Perm class --- .../hadder/commands/owner/EchoCommand.java | 76 +++++++++++-------- src/main/java/com/bbn/hadder/core/Perm.java | 42 +++++----- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java index fe6f8d1..e5d263f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.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.owner; @@ -20,6 +32,7 @@ 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(); @@ -34,6 +47,37 @@ public class EchoCommand implements Command { } } + 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"}; @@ -54,34 +98,4 @@ public class EchoCommand implements Command { return null; } - 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); - } - } } diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/com/bbn/hadder/core/Perm.java index c3cb4e1..042412e 100644 --- a/src/main/java/com/bbn/hadder/core/Perm.java +++ b/src/main/java/com/bbn/hadder/core/Perm.java @@ -23,64 +23,64 @@ public enum Perm { BOT_OWNER() { @Override - public boolean check(CommandEvent event) { - return event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_MESSAGES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MESSAGE_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, EMBED_MESSAGES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + 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 event) { - return event.getMember().hasPermission(Permission.BAN_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.BAN_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, KICK_MEMBERS { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.KICK_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.KICK_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_SERVER { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MANAGE_SERVER) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_ROLES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MANAGE_ROLES) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_NICKNAMES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.NICKNAME_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, ADMINISTRATOR { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.ADMINISTRATOR) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.ADMINISTRATOR) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_WEBHOOKS { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }; - public abstract boolean check(CommandEvent event); + public abstract boolean check(CommandEvent e); }