greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Codacy

Browse source
This commit is contained in:
GregTCLTK 2020-01-24 17:44:24 +01:00
parent 7afba16cde
commit ee2f8a0811
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
10 changed files with 56 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/main/java/com/bbn/hadder/RethinkServer.java
View file

@ -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() {

8
src/main/java/com/bbn/hadder/RethinkUser.java
View file

@ -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()) {

2
src/main/java/com/bbn/hadder/audio/TrackManager.java
View file

@ -32,7 +32,7 @@ public class TrackManager extends AudioEventAdapter {
private final AudioPlayer player;
private final AudioManager manager;
private final Queue<AudioInfo> queue;
AudioTrack lastTrack;
private AudioTrack lastTrack;
private boolean loop = false;
public TrackManager(AudioPlayer player, AudioManager manager) {

6
src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java
View file

@ -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();

8
src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
View file

@ -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",

2
src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
View file

@ -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();

12
src/main/java/com/bbn/hadder/commands/music/RecordCommand.java
View file

@ -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<String, Queue<byte[]>> queue = new HashMap<String, Queue<byte[]>>();
private final HashMap<String, Queue<byte[]>> queue = new HashMap<>();
@Override
public void executed(String[] args, CommandEvent event) {
@ -49,7 +41,7 @@ public class RecordCommand implements Command {
for (Map.Entry<String, Queue<byte[]>> key : queue.entrySet()) {
File file = new File("./"+event.getJDA().getUserById(key.getKey())+".wav");
}
}
}

8
src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
View file

@ -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/");
}
}

20
src/main/java/com/bbn/hadder/listener/RulesListener.java
View file

@ -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();
}
}
}

4
src/main/java/com/bbn/hadder/listener/StarboardListener.java
View file

@ -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(