From ee2f8a081123c5d02b0fca2fef3213733c02eb49 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:44:24 +0100 Subject: [PATCH] Codacy --- .../java/com/bbn/hadder/RethinkServer.java | 50 +++++++++---------- src/main/java/com/bbn/hadder/RethinkUser.java | 8 +-- .../com/bbn/hadder/audio/TrackManager.java | 2 +- .../commands/moderation/EditRulesCommand.java | 6 +-- .../moderation/InviteDetectCommand.java | 8 +-- .../commands/moderation/StarboardCommand.java | 2 +- .../hadder/commands/music/RecordCommand.java | 12 +---- .../hadder/listener/InviteLinkListener.java | 8 +-- .../bbn/hadder/listener/RulesListener.java | 20 ++++---- .../hadder/listener/StarboardListener.java | 4 +- 10 files changed, 56 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index e73a9d3..36af37e 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 = ""; + private String accept_emote = ""; + private String decline_emote = ""; + private String id; + private boolean invite_detect = false; + private String message_id = ""; + private String neededstars = "3"; + private String prefix = "h."; + private String role_id = ""; + private String starboard = ""; public RethinkServer(JSONObject object, Rethink rethink) { for (Field field : this.getClass().getDeclaredFields()) { @@ -48,19 +48,19 @@ public class RethinkServer { this.rethink = rethink; } - public String getAccept_emote() { + public String getAcceptEmote() { return accept_emote; } - public void setAccept_emote(String accept_emote) { + public void setAcceptEmote(String accept_emote) { this.accept_emote = accept_emote; } - public String getDecline_emote() { + public String getDeclineEmote() { return decline_emote; } - public void setDecline_emote(String decline_emote) { + public void setDeclineEmote(String decline_emote) { this.decline_emote = decline_emote; } @@ -68,27 +68,27 @@ public class RethinkServer { return id; } - public boolean isInvite_detect() { + public boolean isInviteDetect() { return invite_detect; } - public void setInvite_detect(boolean invite_detect) { + public void setInviteDetect(boolean invite_detect) { this.invite_detect = invite_detect; } - public String getMessage_id() { + public String getMessageID() { return message_id; } - public void setMessage_id(String message_id) { + public void setMessageID(String message_id) { this.message_id = message_id; } - public String getNeededstars() { + public String getNeededStars() { return neededstars; } - public void setNeededstars(String neededstars) { + public void setNeededStars(String neededstars) { this.neededstars = neededstars; } @@ -100,11 +100,11 @@ public class RethinkServer { this.prefix = prefix; } - public String getRole_id() { + public String getRoleID() { return role_id; } - public void setRole_id(String role_id) { + public void setRoleID(String role_id) { this.role_id = role_id; } @@ -117,10 +117,10 @@ public class RethinkServer { } public void updateRules(String message_id, String role_id, String accept_emote, String decline_emote) { - this.setMessage_id(message_id); - this.setRole_id(role_id); - this.setAccept_emote(accept_emote); - this.setDecline_emote(decline_emote); + this.setMessageID(message_id); + this.setRoleID(role_id); + this.setAcceptEmote(accept_emote); + this.setDeclineEmote(decline_emote); } public void push() { diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index 26376f5..94a7189 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"; + private String id; + private String prefix = "h."; + private String language = "en"; + private String blacklisted = "none"; public RethinkUser(JSONObject object, Rethink rethink) { for (Field field : this.getClass().getDeclaredFields()) { diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index b1c9946..bb4141f 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -32,7 +32,7 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final AudioManager manager; private final Queue queue; - AudioTrack lastTrack; + private AudioTrack lastTrack; private boolean loop = false; public TrackManager(AudioPlayer player, AudioManager manager) { diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index f0f4f6d..7b6b70b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -28,7 +28,7 @@ public class EditRulesCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { - if (e.getRethinkServer().getMessage_id().length() == 18) { + if (e.getRethinkServer().getMessageID().length() == 18) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.message.title", "commands.moderation.editrules.message.description").build()).queue(); @@ -74,7 +74,7 @@ public class EditRulesCommand implements Command { public void checkChannel(CommandEvent e, String rules, TextChannel channel) { try { - channel.retrieveMessageById(e.getRethinkServer().getMessage_id()).queue(); + channel.retrieveMessageById(e.getRethinkServer().getMessageID()).queue(); setRules(e, rules, channel); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.success.title", @@ -87,7 +87,7 @@ public class EditRulesCommand implements Command { } public void setRules(CommandEvent e, String rules, TextChannel channel) { - channel.retrieveMessageById(e.getRethinkServer().getMessage_id()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + channel.retrieveMessageById(e.getRethinkServer().getMessageID()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(rules) .build()).queue(); 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 6df2eef..faad4da 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -31,8 +31,8 @@ public class InviteDetectCommand implements Command { String opinion = args[0].toLowerCase(); switch (opinion) { case "on": - if (!e.getRethinkServer().isInvite_detect()) { - e.getRethinkServer().setInvite_detect(true); + if (!e.getRethinkServer().isInviteDetect()) { + e.getRethinkServer().setInviteDetect(true); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -50,8 +50,8 @@ public class InviteDetectCommand implements Command { break; case "off": - if (e.getRethinkServer().isInvite_detect()) { - e.getRethinkServer().setInvite_detect(false); + if (e.getRethinkServer().isInviteDetect()) { + e.getRethinkServer().setInviteDetect(false); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.deactivate.success.title", 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 0871a17..2c497e3 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -45,7 +45,7 @@ public class StarboardCommand implements Command { } if (args.length==2) { - e.getRethinkServer().setNeededstars(args[1]); + e.getRethinkServer().setNeededStars(args[1]); } e.getRethinkServer().push(); 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 875cf53..48339ed 100644 --- a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java @@ -10,31 +10,23 @@ import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import net.dv8tion.jda.api.audio.AudioReceiveHandler; import net.dv8tion.jda.api.audio.AudioSendHandler; -import net.dv8tion.jda.api.audio.CombinedAudio; import net.dv8tion.jda.api.audio.UserAudio; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.managers.AudioManager; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.sound.sampled.*; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.HashMap; import java.util.Map; import java.util.Queue; -import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; @Perms(Perm.BOT_OWNER) public class RecordCommand implements Command { - private final HashMap> queue = new HashMap>(); + private final HashMap> queue = new HashMap<>(); @Override public void executed(String[] args, CommandEvent event) { @@ -49,7 +41,7 @@ public class RecordCommand implements Command { for (Map.Entry> key : queue.entrySet()) { File file = new File("./"+event.getJDA().getUserById(key.getKey())+".wav"); - + } } } diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index 9e16a59..88aa3ee 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) { 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.isInvite_detect())) { + 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.isInvite_detect())) { + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { 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.isInvite_detect()) { + 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.isInvite_detect()) { + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect()) { checkInvite(e.getMessage(), "discordapp.com/invite/"); } } diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index a4e0812..8ee5fc4 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -33,20 +33,20 @@ public class RulesListener extends ListenerAdapter { @Override public void onMessageReactionAdd(MessageReactionAddEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessageId().equals(rethinkServer.getMessage_id()) && !e.getUser().isBot()) { + if (e.getMessageId().equals(rethinkServer.getMessageID()) && !e.getUser().isBot()) { if (e.getReactionEmote().isEmote()) { - if (rethinkServer.getAccept_emote().equals(e.getReactionEmote().getId())) { + if (rethinkServer.getAcceptEmote().equals(e.getReactionEmote().getId())) { addRole(e); - } else if (rethinkServer.getDecline_emote().equals(e.getReactionEmote().getId())) { + } else if (rethinkServer.getDeclineEmote().equals(e.getReactionEmote().getId())) { e.getReaction().removeReaction(e.getUser()).queue(); if (e.getGuild().getSelfMember().canInteract(e.getMember())) { e.getMember().kick().reason("Declined the rules"); } } } else if (e.getReactionEmote().isEmoji()) { - if (rethinkServer.getAccept_emote().equals(e.getReactionEmote().getEmoji())) { + if (rethinkServer.getAcceptEmote().equals(e.getReactionEmote().getEmoji())) { addRole(e); - } else if (rethinkServer.getDecline_emote().equals(e.getReactionEmote().getEmoji())) { + } else if (rethinkServer.getDeclineEmote().equals(e.getReactionEmote().getEmoji())) { e.getReaction().removeReaction(e.getUser()).queue(); if (e.getGuild().getSelfMember().canInteract(e.getMember())) { e.getMember().kick().reason("Declined the rules"); @@ -58,16 +58,16 @@ public class RulesListener extends ListenerAdapter { private void addRole(MessageReactionAddEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRole_id()))) { - e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); - } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); + if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRoleID()))) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); + } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); } @Override public void onMessageReactionRemove(MessageReactionRemoveEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessageId().equals(rethinkServer.getMessage_id()) && !e.getUser().isBot()) { - e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Withdrawal of the acceptance of the rules").queue(); + if (e.getMessageId().equals(rethinkServer.getMessageID()) && !e.getUser().isBot()) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Withdrawal of the acceptance of the rules").queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index bb8cdcc..ba66f81 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -60,7 +60,7 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethinkServer.getNeededstars()) <= stars) { + if (Integer.parseInt(rethinkServer.getNeededStars()) <= stars) { e.getGuild().getTextChannelById(rethinkServer.getStarboard()) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + e.getTextChannel().getAsMention()) @@ -94,7 +94,7 @@ public class StarboardListener extends ListenerAdapter { .retrieveMessageById(rethink.getStarboardMessage(e.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethinkServer.getNeededstars()) <= finalStars) { + if (Integer.parseInt(rethinkServer.getNeededStars()) <= finalStars) { msg2.editMessage(new MessageBuilder() .setContent("⭐ " + finalStars + " " + e.getTextChannel().getAsMention()) .setEmbed(