Rename event to e in Perm class
This commit is contained in:
parent
e3f835c9ca
commit
5bba1ab9c3
2 changed files with 66 additions and 52 deletions
|
|
@ -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;
|
package com.bbn.hadder.commands.owner;
|
||||||
|
|
@ -20,6 +32,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
|
|
||||||
@Perms(Perm.BOT_OWNER)
|
@Perms(Perm.BOT_OWNER)
|
||||||
public class EchoCommand implements Command {
|
public class EchoCommand implements Command {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void executed(String[] args, CommandEvent event) {
|
public void executed(String[] args, CommandEvent event) {
|
||||||
Guild guild = event.getMember().getVoiceState().getChannel().getGuild();
|
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<byte[]> 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
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"echo"};
|
return new String[]{"echo"};
|
||||||
|
|
@ -54,34 +98,4 @@ public class EchoCommand implements Command {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class EchoHandler implements AudioSendHandler, AudioReceiveHandler {
|
|
||||||
|
|
||||||
private final Queue<byte[]> 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,64 +23,64 @@ public enum Perm {
|
||||||
|
|
||||||
BOT_OWNER() {
|
BOT_OWNER() {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
MANAGE_MESSAGES {
|
MANAGE_MESSAGES {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.MESSAGE_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
EMBED_MESSAGES {
|
EMBED_MESSAGES {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
BAN_MEMBERS {
|
BAN_MEMBERS {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.BAN_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.BAN_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
KICK_MEMBERS {
|
KICK_MEMBERS {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.KICK_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.KICK_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
MANAGE_SERVER {
|
MANAGE_SERVER {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.MANAGE_SERVER) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
MANAGE_ROLES {
|
MANAGE_ROLES {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.MANAGE_ROLES) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
MANAGE_NICKNAMES {
|
MANAGE_NICKNAMES {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.NICKNAME_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ADMINISTRATOR {
|
ADMINISTRATOR {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.ADMINISTRATOR) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
return e.getMember().hasPermission(Permission.ADMINISTRATOR) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
MANAGE_WEBHOOKS {
|
MANAGE_WEBHOOKS {
|
||||||
@Override
|
@Override
|
||||||
public boolean check(CommandEvent event) {
|
public boolean check(CommandEvent e) {
|
||||||
return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
|
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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue