diff --git a/pom.xml b/pom.xml
index 79ee1d3..712e13f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
net.dv8tion
JDA
- 4.1.0_90
+ 4.1.0_93
org.json
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 2ce9a4e..fc432c2 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
@@ -82,8 +82,8 @@ public class RulesCommand implements Command {
if (event3.getMessage().getMentionedRoles().size() == 1) {
Role role = event3.getMessage().getMentionedRoles().get(0);
setRole(event, channel, message, event3, role);
- } else if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size() > 0) {
- Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
+ } else if (event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).size() > 0) {
+ Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).get(0);
setRole(event, channel, message, event3, role);
} else {
event3.getChannel().sendMessage(
@@ -113,106 +113,113 @@ public class RulesCommand implements Command {
public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) {
if (event3.getGuild().getSelfMember().canInteract(role)) {
- event3.getChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.INFO,
- "commands.moderation.rules.emote.accept.title",
- "",
- "commands.moderation.rules.emote.accept.description", role.getName())
- .build()).queue();
- event.getEventWaiter().newOnMessageEventWaiter(event4 -> {
- if (event4.getMessage().getEmotes().size() == 1) {
- Emote aemote = event4.getMessage().getEmotes().get(0);
- event4.getChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.INFO,
- "commands.moderation.rules.emote.decline.title", "",
- "commands.moderation.rules.emote.decline.description", String.valueOf(aemote))
- .build()).queue();
- event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
- Emote demote = event5.getMessage().getEmotes().get(0);
- if (!aemote.equals(demote)) {
- Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
- .setTitle("Rules")
- .setDescription(message)
- .build()).complete();
- try {
- rules.addReaction(aemote).queue();
- rules.addReaction(demote).queue();
- event5.getChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.INFO,
- "commands.moderation.rules.success.title",
- "",
- "commands.moderation.rules.success.description",
- channel.getAsMention())
+ if (event3.getMember().canInteract(role)) {
+ event3.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.INFO,
+ "commands.moderation.rules.emote.accept.title",
+ "",
+ "commands.moderation.rules.emote.accept.description", role.getName())
+ .build()).queue();
+ event.getEventWaiter().newOnMessageEventWaiter(event4 -> {
+ if (event4.getMessage().getEmotes().size() == 1) {
+ Emote aemote = event4.getMessage().getEmotes().get(0);
+ event4.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.INFO,
+ "commands.moderation.rules.emote.decline.title", "",
+ "commands.moderation.rules.emote.decline.description", String.valueOf(aemote))
.build()).queue();
- } catch (Exception e) {
- event5.getChannel().sendMessage(
+ event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
+ Emote demote = event5.getMessage().getEmotes().get(0);
+ if (!aemote.equals(demote)) {
+ Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+ .setTitle("Rules")
+ .setDescription(message)
+ .build()).complete();
+ try {
+ rules.addReaction(aemote).queue();
+ rules.addReaction(demote).queue();
+ event5.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.INFO,
+ "commands.moderation.rules.success.title",
+ "",
+ "commands.moderation.rules.success.description",
+ channel.getAsMention())
+ .build()).queue();
+ } catch (Exception e) {
+ event5.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.ERROR,
+ "error",
+ "commands.moderation.rules.emote.error.access.description")
+ .build()).queue();
+ e.printStackTrace();
+ }
+ event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
+ } else {
+ event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR,
- "error",
- "commands.moderation.rules.emote.error.access.description")
- .build()).queue();
- e.printStackTrace();
+ "commands.moderation.rules.emote.error.equal.title",
+ "commands.moderation.rules.emote.error.equal.description")
+ .build()).queue();
}
- event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
- } else {
- event.getTextChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.ERROR,
- "commands.moderation.rules.emote.error.equal.title",
- "commands.moderation.rules.emote.error.equal.description")
- .build()).queue();
- }
- }, event.getJDA(), event.getAuthor());
- } else {
- String aemote = event4.getMessage().getContentRaw();
- event4.getChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.INFO,
- "commands.moderation.rules.emote.decline.title",
- "commands.moderation.rules.emoji.decline.description")
- .build()).queue();
- event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
- String demote = event5.getMessage().getContentRaw();
- if (!aemote.equals(demote)) {
- Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
- .setTitle("Rules")
- .setDescription(message)
- .build()).complete();
- try {
- rules.addReaction(aemote).queue();
- rules.addReaction(demote).queue();
- event5.getChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.INFO,
- "commands.moderation.rules.success.title",
- "",
- "commands.moderation.rules.success.description",
- channel.getAsMention())
+ }, event.getJDA(), event.getAuthor());
+ } else {
+ String aemote = event4.getMessage().getContentRaw();
+ event4.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.INFO,
+ "commands.moderation.rules.emote.decline.title",
+ "commands.moderation.rules.emoji.decline.description")
.build()).queue();
- } catch (Exception e) {
- event5.getChannel().sendMessage(
+ event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
+ String demote = event5.getMessage().getContentRaw();
+ if (!aemote.equals(demote)) {
+ Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+ .setTitle("Rules")
+ .setDescription(message)
+ .build()).complete();
+ try {
+ rules.addReaction(aemote).queue();
+ rules.addReaction(demote).queue();
+ event5.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.INFO,
+ "commands.moderation.rules.success.title",
+ "",
+ "commands.moderation.rules.success.description",
+ channel.getAsMention())
+ .build()).queue();
+ } catch (Exception e) {
+ event5.getChannel().sendMessage(
+ event.getMessageEditor().getMessage(
+ MessageEditor.MessageType.ERROR,
+ "error",
+ "commands.moderation.rules.emoji.error.description")
+ .build()).queue();
+ e.printStackTrace();
+ }
+ event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
+ } else {
+ event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR,
- "error",
- "commands.moderation.rules.emoji.error.description")
- .build()).queue();
- e.printStackTrace();
+ "commands.moderation.rules.emote.error.equal.title",
+ "commands.moderation.rules.emote.error.equal.description")
+ .build()).queue();
}
- event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
- } else {
- event.getTextChannel().sendMessage(
- event.getMessageEditor().getMessage(
- MessageEditor.MessageType.ERROR,
- "commands.moderation.rules.emote.error.equal.title",
- "commands.moderation.rules.emote.error.equal.description")
- .build()).queue();
- }
- }, event.getJDA(), event.getAuthor());
- }
- }, event.getJDA(), event.getAuthor());
+ }, event.getJDA(), event.getAuthor());
+ }
+ }, event.getJDA(), event.getAuthor());
+ } else {
+ event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+ "commands.moderation.rules.role.permission.error.title",
+ "commands.moderation.rules.role.permission.error.description")
+ .build()).queue();
+ }
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
}
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 e0b2975..ceafccd 100644
--- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
@@ -1,15 +1,14 @@
package com.bbn.hadder.commands.music;
-/*
- * @author Skidder / GregTCLTK
- */
-
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.VoiceChannel;
import net.dv8tion.jda.api.managers.AudioManager;
+/*
+ * @author Skidder / GregTCLTK
+ */
public class JoinCommand implements Command {
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
index 775ad94..c55a4da 100644
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -41,8 +41,9 @@ public class CommandHandler {
for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
if (!perm.check(commandEvent)) {
commandEvent.getTextChannel()
- .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
- .queue();
+ .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION)
+ .setDescription("To execute this command, you need the `" + cmd.getClass().getAnnotation(Perms.class).value()[0] + "` permission.")
+ .build()).queue();
return;
}
}
@@ -51,8 +52,8 @@ public class CommandHandler {
boolean run = true;
String blacklisted = rethink.getBlackListed(event.getAuthor().getId());
if (!"none".equals(blacklisted)) {
- for (String blacklistedlabel : blacklisted.split(",")) {
- if (Arrays.asList(cmd.labels()).contains(blacklistedlabel)) {
+ for (String BLLabel : blacklisted.split(",")) {
+ if (Arrays.asList(cmd.labels()).contains(BLLabel)) {
run = false;
}
}
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index d4f0582..650848b 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign
commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules.
commands.moderation.rules.role.error.title = Role does not exist
commands.moderation.rules.role.error.description = The specified role does not exist on this guild.
+commands.moderation.rules.role.permission.error.title = No permission
+commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it.
commands.moderation.rules.guild.error.title = Wrong Guild
commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\!
commands.moderation.rules.emote.accept.title = Custom Accept Emote