From 984fb4e6577a22a2c8138f11da424c732ac20083 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2019 13:21:52 +0000 Subject: [PATCH 1/5] Bump JDA from 4.0.0_61 to 4.0.0_62 Bumps JDA from 4.0.0_61 to 4.0.0_62. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7afe0e1..6e152d2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_61 + 4.0.0_62 org.json -- 2.45.3 From cc3eee194571564b54b1e4c6056a8e541215c59e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 20 Nov 2019 12:05:36 -0800 Subject: [PATCH 2/5] LATEST is deprecated my friends --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3021ff..e790e10 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.json json - LATEST + 20190722 com.rethinkdb -- 2.45.3 From 471aaa887dd11336ede4cf7aa4ab2deaf4f405f4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 20 Nov 2019 12:05:41 -0800 Subject: [PATCH 3/5] Fix --- src/main/java/com/bbn/hadder/listener/RulesListener.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 0d9bfb1..aba0854 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -19,7 +19,9 @@ public class RulesListener extends ListenerAdapter { @Override public void onMessageReactionAdd(MessageReactionAddEvent event) { if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId()))) { - event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).queue(); + if (!event.getMember().getUser().isBot()) { + event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).queue(); + } } } } -- 2.45.3 From 14360eb5124dabd28152e7ec6aa87e45ad42eb13 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 21 Nov 2019 07:39:44 -0800 Subject: [PATCH 4/5] Fix sth. --- .../commands/moderation/RulesCommand.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 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 ef656ed..a1cafa6 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -19,33 +19,33 @@ public class RulesCommand implements Command { if (event.getMember().hasPermission(Permission.MANAGE_SERVER)) { if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() - .setTitle("Rules setup") - .setDescription("Please mention the channel în which I should send the rules. This should look like #rules.")) + .setTitle("Set up rules") + .setDescription("Please specify the channel on which I should send the rules. Your message should look like: #rules.")) .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent -> { - if (msgevent.getMessage().getMentionedChannels().size() > 0) { - msgevent.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() + new EventWaiter().newOnMessageEventWaiter(event1 -> { + if (event1.getMessage().getMentionedChannels().size() > 0) { + event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Rules") - .setDescription("Now please send me the rules.")) + .setDescription("Please send me the rules now.")) .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent2 -> { - msgevent2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() + new EventWaiter().newOnMessageEventWaiter(event2 -> { + event2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Role to assign")) - .setDescription("Now please send me the name of the role which the user will get after he accepted the rules.") + .setDescription("Please send me the name of the role the user receives after he has accepted the rules.") .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent3 -> { + new EventWaiter().newOnMessageEventWaiter(event3 -> { try { - msgevent3.getGuild().getRolesByName(msgevent3.getMessage().getContentRaw(), false).get(0); - msgevent3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder().setTitle("Successfully set the rules")).build()).queue(); - Message rules = msgevent.getMessage().getMentionedChannels().get(0).sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() + event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).get(0); + event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder().setTitle("Successfully set the rules")).build()).queue(); + Message rules = event1.getMessage().getMentionedChannels().get(0).sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Rules")) - .setDescription(msgevent2.getMessage().getContentDisplay()) + .setDescription(event2.getMessage().getContentDisplay()) .build()).complete(); rules.addReaction("✅").queue(); rules.addReaction("❌").queue(); - event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), msgevent3.getGuild().getRolesByName(msgevent3.getMessage().getContentRaw(), false).get(0).getId()); + event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), false).get(0).getId()); } catch (Exception e) { e.printStackTrace(); } -- 2.45.3 From 971f6f422d1922da162072c5a4da6310e418a1b4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 21 Nov 2019 09:24:54 -0800 Subject: [PATCH 5/5] Better code --- .../commands/moderation/RulesCommand.java | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 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 a1cafa6..468d8a6 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -11,6 +11,8 @@ import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; public class RulesCommand implements Command { @@ -22,33 +24,36 @@ public class RulesCommand implements Command { .setTitle("Set up rules") .setDescription("Please specify the channel on which I should send the rules. Your message should look like: #rules.")) .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(event1 -> { if (event1.getMessage().getMentionedChannels().size() > 0) { + TextChannel channel = event1.getMessage().getMentionedChannels().get(0); event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Rules") - .setDescription("Please send me the rules now.")) + .setDescription("The channel was successfully set to " + channel.getName() + ". Please send me the rules now.")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { + String message = event2.getMessage().getContentDisplay(); event2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Role to assign")) - .setDescription("Please send me the name of the role the user receives after he has accepted the rules.") + .setDescription("The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules.") .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event3 -> { - try { - event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).get(0); - event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder().setTitle("Successfully set the rules")).build()).queue(); - Message rules = event1.getMessage().getMentionedChannels().get(0).sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() - .setTitle("Rules")) - .setDescription(event2.getMessage().getContentDisplay()) - .build()).complete(); - rules.addReaction("✅").queue(); - rules.addReaction("❌").queue(); - - event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), false).get(0).getId()); - } catch (Exception e) { - e.printStackTrace(); - } + Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).get(0); + if (event3.getGuild().getSelfMember().canInteract(role)) { + event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() + .setTitle("The role has been successfully set to " + role.getName() + ".")) + .build()).queue(); + Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() + .setTitle("Rules")) + .setDescription(message) + .build()).complete(); + rules.addReaction("✅").queue(); + rules.addReaction("❌").queue(); + event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId()); + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); + } }, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor()); } else { -- 2.45.3