From 92e28ead122b1a841b9e6cd6f2b77952c5ec5ea9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 7 Dec 2019 10:23:15 +0100 Subject: [PATCH 1/8] ressources folder is back --- src/main/{java => resources}/META-INF/MANIFEST.MF | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/{java => resources}/META-INF/MANIFEST.MF (100%) diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from src/main/java/META-INF/MANIFEST.MF rename to src/main/resources/META-INF/MANIFEST.MF From 562f520dfa463a634ebdede042d7b09dce0c0dcf Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 7 Dec 2019 12:09:53 +0100 Subject: [PATCH 2/8] Language command --- src/main/java/com/bbn/hadder/Hadder.java | 1 + src/main/java/com/bbn/hadder/Rethink.java | 4 ++ .../commands/settings/LanguageCommand.java | 44 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index c17982b..b4f0ad9 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -87,6 +87,7 @@ public class Hadder { new SoloCommand(), new RegionChangeCommand(), new AboutCommand(), + new LanguageCommand(), new LinkCommand()), config, helpCommand); builder.addEventListeners( diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index caf380f..f9e0edb 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -185,4 +185,8 @@ public class Rethink { return (Boolean) this.get("server", "id", guild_id, "invite_detect"); } + public void setLanguage(String user_id, String language) { + this.update("users", user_id, "language", language); + } + } diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java new file mode 100644 index 0000000..0357cf5 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -0,0 +1,44 @@ +package com.bbn.hadder.commands.settings; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; + +public class LanguageCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + if (args.length == 1) { + switch (args[0].toLowerCase()) { + case "DE": + event.getRethink().setLanguage(event.getAuthor().getId(), "DE"); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + .setTitle("Language set") + .setDescription("German is your new language now.") + .build()).queue(); + break; + } + } else { + event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + } + } + + @Override + public String[] labels() { + return new String[]{"language"}; + } + + @Override + public String description() { + return "Sets the new primary language for a user."; + } + + @Override + public String usage() { + return ""; + } +} From 27443316be67acdabbc797a39bad9b6644467a7c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 7 Dec 2019 20:00:27 +0100 Subject: [PATCH 3/8] Join Command more error messages --- src/main/java/com/bbn/hadder/Rethink.java | 2 +- .../java/com/bbn/hadder/commands/music/JoinCommand.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index f9e0edb..5de5415 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -143,7 +143,7 @@ public class Rethink { } public void insertGuild(String id) { - this.insert("server", r.hashMap("id", id).with("prefix", "h.").with("links", "[]").with("linkchannel", "").with("message_id", "").with("role_id", "").with("invite_detect", false)); + this.insert("server", r.hashMap("id", id).with("prefix", "h.").with("links", "[]").with("linkchannel", "").with("message_id", "").with("role_id", "").with("invite_detect", false).with("language", "EN")); } public void insertUser(String id) { diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index 9cc43f5..6dbb093 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -19,11 +19,18 @@ public class JoinCommand implements Command { AudioManager audioManager = event.getGuild().getAudioManager(); if(!audioManager.isAttemptingToConnect()) { VoiceChannel vc = event.getMember().getVoiceState().getChannel(); + if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { event.getGuild().getAudioManager().openAudioConnection(vc); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("Successfully connected") .setDescription("I successfully connected to " + vc.getName() + ".") .build()).queue(); + } else { + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + .setTitle("Already connected") + .setDescription("I am already connected to your voice channel.") + .build()).queue(); + } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) .setTitle("Already trying to connect") From 5e5b486269ed3504087a0a2137c8b57ac0d77b65 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 7 Dec 2019 23:13:09 +0100 Subject: [PATCH 4/8] Clear Command improvement --- .../bbn/hadder/commands/moderation/ClearCommand.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index cf5fd6a..225dae2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -12,6 +12,7 @@ import net.dv8tion.jda.api.entities.Message; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; public class ClearCommand implements Command { @@ -24,14 +25,20 @@ public class ClearCommand implements Command { try { int nbToDelete = Integer.parseInt(args[0]); if(nbToDelete < 1 || nbToDelete > 200) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You have to choose a number between 1 and 200!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You have to choose a number between 1 and 99!").build()).queue(); return; } List history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete(); List msgToDelete = new ArrayList<>(); msgToDelete.addAll(history); event.getTextChannel().deleteMessages(msgToDelete).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).queue(); + Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).complete(); + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException e) { + e.printStackTrace(); + } + msg.delete().queue(); } catch (NumberFormatException e) { event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); } From ab752205e0634d98733bf9e07b5b0d1790896fe0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 8 Dec 2019 01:40:09 +0100 Subject: [PATCH 5/8] Help Command improvement --- .../com/bbn/hadder/commands/fun/AvatarCommand.java | 2 +- .../java/com/bbn/hadder/commands/fun/GifCommand.java | 2 +- .../com/bbn/hadder/commands/general/HelpCommand.java | 10 +++++----- .../bbn/hadder/commands/misc/ScreenShareCommand.java | 10 +++++----- .../com/bbn/hadder/commands/moderation/BanCommand.java | 2 +- .../bbn/hadder/commands/moderation/ClearCommand.java | 4 ++-- .../hadder/commands/moderation/GuildPrefixCommand.java | 2 +- .../commands/moderation/InviteDetectCommand.java | 2 +- .../bbn/hadder/commands/moderation/KickCommand.java | 2 +- .../bbn/hadder/commands/moderation/LinkCommand.java | 2 +- .../bbn/hadder/commands/moderation/NickCommand.java | 4 ++-- .../bbn/hadder/commands/moderation/RoleCommand.java | 2 +- .../com/bbn/hadder/commands/owner/EvalCommand.java | 2 +- .../bbn/hadder/commands/owner/GuildLeaveCommand.java | 2 +- .../bbn/hadder/commands/settings/LanguageCommand.java | 2 +- .../bbn/hadder/commands/settings/PrefixCommand.java | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index fab81a9..2e807c2 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -35,7 +35,7 @@ public class AvatarCommand implements Command { .setFooter(member.getUser().getAsTag()) .build()).queue(); } else { - event.getHelpCommand().sendHelp(this , event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index bcab30a..7503bc4 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -39,7 +39,7 @@ public class GifCommand implements Command { } catch (Exception e) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription("Please try again with another term.").build()).queue(); } - } else event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + } else event.getHelpCommand().sendHelp(this, event); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 1d196ac..aaf1f6e 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -48,7 +48,7 @@ public class HelpCommand implements Command { for (Command cmd : event.getCommandHandler().getCommandList()) { for (String label : cmd.labels()) { if (label.equalsIgnoreCase(args[0])) { - sendHelp(cmd, event.getRethink(), event.getAuthor(), event.getTextChannel()); + sendHelp(cmd, event); } } } @@ -58,15 +58,15 @@ public class HelpCommand implements Command { } } - public void sendHelp(Command cmd, Rethink rethink, User author, TextChannel channel) { + public void sendHelp(Command cmd, CommandEvent event) { if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && - (author.getId().equals("477141528981012511") || author.getId().equals("261083609148948488")))) { + (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { EmbedBuilder eb = new EmbedBuilder(); String name = cmd.labels()[0]; eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); - eb.addField("Usage", rethink.getUserPrefix(author.getId()) + cmd.labels()[0] + " " + cmd.usage(), false); + eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO); - channel.sendMessage(eb.build()).queue(); + event.getChannel().sendMessage(eb.build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index 1678f56..f320a6d 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -27,7 +27,7 @@ public class ScreenShareCommand implements Command { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) .setTitle("Wait, that's illegal") .setDescription("This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue(); - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); return; } } @@ -53,20 +53,20 @@ public class ScreenShareCommand implements Command { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) .setTitle("You specified a wrong number!").build()).queue(); - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } catch (NumberFormatException e) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) .setTitle("Wait, that's illegal") .setDescription("This isn't a Number.").build()).queue(); - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } }, event.getJDA(), event.getAuthor()); } else if (vcs.size()==0) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) .setTitle("Hol' up") .setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue(); - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } else { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setTitle("Here's your Url to share your Screen") @@ -74,7 +74,7 @@ public class ScreenShareCommand implements Command { } } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 7c8ce46..6796b72 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -32,7 +32,7 @@ public class BanCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("You can't ban yourself!").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } else if (event.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 225dae2..d5fe960 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -40,7 +40,7 @@ public class ClearCommand implements Command { } msg.delete().queue(); } catch (NumberFormatException e) { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); @@ -49,7 +49,7 @@ public class ClearCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java index 5281789..8891d0f 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java @@ -19,7 +19,7 @@ public class GuildPrefixCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("The prefix must not contain **\"**").build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).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 12ddc03..084f787 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -51,7 +51,7 @@ public class InviteDetectCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 9da327a..2c44aa4 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -33,7 +33,7 @@ public class KickCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't kick yourself.").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } else if (event.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java index 4a08fbb..bd8a248 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.entities.Guild; public class LinkCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length == 0) event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + if (args.length == 0) event.getHelpCommand().sendHelp(this, event); switch (args[0].toLowerCase()) { case "add": if (args.length != 2) return; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 4138901..7aad865 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -28,7 +28,7 @@ public class NickCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); @@ -43,7 +43,7 @@ public class NickCommand implements Command { } } } else if (event.getMessage().getMentionedMembers().size() == 0) { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } else { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 19dfe54..3da7135 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -67,7 +67,7 @@ public class RoleCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index 189a156..c18964f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -77,7 +77,7 @@ public class EvalCommand implements Command { }, 0, TimeUnit.MILLISECONDS); } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 5b1975b..90d1318 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -22,7 +22,7 @@ public class GuildLeaveCommand implements Command { .setDescription("I successfully left " + guild.getName()) .build()).queue(); } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 0357cf5..ce450f1 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -23,7 +23,7 @@ public class LanguageCommand implements Command { break; } } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index aa70bf1..4de3e84 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -16,7 +16,7 @@ public class PrefixCommand implements Command { event.getRethink().setUserPrefix(args[0], event.getAuthor().getId()); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); } else { - event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); + event.getHelpCommand().sendHelp(this, event); } } From 0fdd5152b79c51c99f814d41f2d6c5be7c67d962 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Dec 2019 07:49:36 +0100 Subject: [PATCH 6/8] Hotfix --- src/main/java/com/bbn/hadder/listener/RulesListener.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 8483647..7b3cb0e 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -30,14 +30,7 @@ public class RulesListener extends ListenerAdapter { } } } else if (event.getReactionEmote().isEmoji()) { - if (event.getReactionEmote().getEmoji().equals(rethink.getRulesAEmote(event.getGuild().getId()))) { - event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); - } else if (event.getReactionEmote().getEmoji().equals(rethink.getRulesDEmote(event.getGuild().getId()))) { - event.getReaction().removeReaction(event.getUser()).queue(); - if (event.getGuild().getSelfMember().canInteract(event.getMember())) { - event.getMember().kick().reason("Declined the rules"); - } - } + event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); } } } From fc0a3d9cc1b935648d9f98fbd69af570bec6f79d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Dec 2019 07:53:51 +0100 Subject: [PATCH 7/8] Error message --- .../com/bbn/hadder/commands/moderation/RulesCommand.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 497e5f0..07a86b4 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -74,10 +74,15 @@ public class RulesCommand implements Command { Role role = event.getMessage().getMentionedRoles().get(0); setRole(event, channel, message, event3, role); } else { - if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size()>0) { + if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size() > 0) { Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0); setRole(event, channel, message, event3, role); - } // TODO + } else { + event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) + .setTitle("Role does not exist") + .setDescription("The specified role does not exist on this guild.") + .build()).queue(); + } } }, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor()); From 5e6a84b583f50c6e5f8e6763dba0da64c11a39bc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Dec 2019 08:02:10 +0100 Subject: [PATCH 8/8] Remove unused imports --- src/main/java/com/bbn/hadder/commands/general/HelpCommand.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index aaf1f6e..476da32 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -1,13 +1,10 @@ package com.bbn.hadder.commands.general; -import com.bbn.hadder.Rethink; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.TextChannel; -import net.dv8tion.jda.api.entities.User; import java.util.ArrayList; import java.util.HashMap;