From cce973037818bf599453e3920127db5d77ac7ede Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 1 Jan 2020 16:49:08 +0100 Subject: [PATCH] Some code improvements again --- example-config.json | 3 ++- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- .../{StarBoardCommand.java => StarboardCommand.java} | 4 ++-- .../bbn/hadder/commands/owner/BlacklistCommand.java | 12 +++++++++--- .../java/com/bbn/hadder/core/CommandHandler.java | 2 +- .../com/bbn/hadder/listener/StarboardListener.java | 4 ++-- .../java/com/bbn/hadder/utils/MessageEditor.java | 4 ++-- 8 files changed, 21 insertions(+), 14 deletions(-) rename src/main/java/com/bbn/hadder/commands/moderation/{StarBoardCommand.java => StarboardCommand.java} (93%) diff --git a/example-config.json b/example-config.json index 437ec97..f787317 100644 --- a/example-config.json +++ b/example-config.json @@ -19,7 +19,8 @@ "DiscordExtremeList": "", "DiscordBotReviews": "", "DiscordBots": "", - "BotListSpace": "" + "BotListSpace": "", + "DiscordBots2": "" }, "Clyde": "" } diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index fb55b0d..85ca64f 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -92,7 +92,7 @@ public class Hadder { new LanguageCommand(), new ClydeCommand(), new PlayCommand(), - new StarBoardCommand(), + new StarboardCommand(), new QueueCommand(), new InfoCommand(), new SkipCommand(), diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 3d84e6a..3bf91a3 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -144,11 +144,11 @@ public class Rethink { return (String) this.get("user", "id", id, "blacklisted"); } - public void setNeededstars(String stars, String guild_id) { + public void setNeededStars(String stars, String guild_id) { this.update("server", guild_id, "neededstars", stars); } - public String getNeededstars(String guild_id) { + public String getNeededStars(String guild_id) { return (String) this.get("server", "id", guild_id, "neededstars"); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java similarity index 93% rename from src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java rename to src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 80d926c..080cd79 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.TextChannel; -public class StarBoardCommand implements Command { +public class StarboardCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { @@ -29,7 +29,7 @@ public class StarBoardCommand implements Command { } if (args.length==2) { - event.getRethink().setNeededstars(args[1], event.getGuild().getId()); + event.getRethink().setNeededStars(args[1], event.getGuild().getId()); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 1741edf..61572c7 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -31,7 +31,7 @@ public class BlacklistCommand implements Command { Member member = event.getMessage().getMentionedMembers().get(0); String blacklisted = event.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); - if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(","))); + if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.addAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); @@ -45,12 +45,13 @@ public class BlacklistCommand implements Command { .build()).queue(); } break; + case "remove": if (args.length == 3) { Member member = event.getMessage().getMentionedMembers().get(0); String blacklisted = event.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); - if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(","))); + if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.removeAll(Arrays.asList(args[1].split(","))); LinkedHashSet hashSet = new LinkedHashSet<>(commands); @@ -64,6 +65,7 @@ public class BlacklistCommand implements Command { .build()).queue(); } break; + case "list": StringBuilder stringBuilder = new StringBuilder(); for (User user : event.getJDA().getUsers()) { @@ -80,6 +82,10 @@ public class BlacklistCommand implements Command { .setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users") .build()).queue(); break; + + default: + event.getHelpCommand().sendHelp(this, event); + break; } } } @@ -101,6 +107,6 @@ public class BlacklistCommand implements Command { @Override public String example() { - return "add porn @Skidder"; + return "add solo @Skidder"; } } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 0a575df..775ad94 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -50,7 +50,7 @@ public class CommandHandler { boolean run = true; String blacklisted = rethink.getBlackListed(event.getAuthor().getId()); - if (!blacklisted.equals("none")) { + if (!"none".equals(blacklisted)) { for (String blacklistedlabel : blacklisted.split(",")) { if (Arrays.asList(cmd.labels()).contains(blacklistedlabel)) { run = false; diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 8bdf694..38c5c52 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -43,7 +43,7 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) { + if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) { event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention()) @@ -77,7 +77,7 @@ public class StarboardListener extends ListenerAdapter { .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) { + if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) { msg2.editMessage(new MessageBuilder() .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention()) .setEmbed( diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 1d39039..4e923ee 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -36,8 +36,8 @@ public class MessageEditor { String description, String description_extra, String description_extra_two) { String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null; EmbedBuilder eb = this.getDefaultSettings(type); - if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); - if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); + if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); + if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); return eb; }