Very nice fix
This commit is contained in:
parent
b81d4821fa
commit
c016d1246d
1 changed files with 128 additions and 114 deletions
|
|
@ -22,10 +22,11 @@ public class RulesCommand implements Command {
|
|||
if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
|
||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder()
|
||||
.setTitle("Set up rules")
|
||||
.setDescription("Please specify the channel on which I should send the rules. Your message should look like: #rules."))
|
||||
.setDescription("Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like: #rules or #verify."))
|
||||
.build()).queue();
|
||||
new EventWaiter().newOnMessageEventWaiter(event1 -> {
|
||||
if (event1.getMessage().getMentionedChannels().size() == 1) {
|
||||
try {
|
||||
TextChannel channel = event1.getMessage().getMentionedChannels().get(0);
|
||||
if (channel.getGuild().getId().equals(event1.getGuild().getId())) {
|
||||
if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) {
|
||||
|
|
@ -58,7 +59,7 @@ public class RulesCommand implements Command {
|
|||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue();
|
||||
}
|
||||
} else {
|
||||
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentRaw().replace("h.rules ", ""), true).get(0);
|
||||
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), 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() + "."))
|
||||
|
|
@ -88,7 +89,14 @@ public class RulesCommand implements Command {
|
|||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder)
|
||||
.build()).queue();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, new EmbedBuilder()
|
||||
.setTitle("Channel not found")
|
||||
.setDescription("I can't find the specified channel. Please start the setup again."))
|
||||
.build()).queue();
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0);
|
||||
if (channel.getGuild().getId().equals(event1.getGuild().getId())) {
|
||||
if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) {
|
||||
|
|
@ -121,7 +129,7 @@ public class RulesCommand implements Command {
|
|||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue();
|
||||
}
|
||||
} else {
|
||||
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).get(0);
|
||||
Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), 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() + "."))
|
||||
|
|
@ -140,15 +148,21 @@ public class RulesCommand implements Command {
|
|||
}
|
||||
}, event.getJDA(), event.getAuthor());
|
||||
}, event.getJDA(), event.getAuthor());
|
||||
} else {
|
||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, new EmbedBuilder()
|
||||
.setTitle("Wrong Guild")
|
||||
.setDescription("The mentioned channel must be on this guid!"))
|
||||
.build()).queue();
|
||||
}
|
||||
} else {
|
||||
EmbedBuilder builder = new EmbedBuilder();
|
||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder)
|
||||
.build()).queue();
|
||||
}
|
||||
} else {
|
||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, new EmbedBuilder()
|
||||
.setTitle("Wrong Guild")
|
||||
.setDescription("The mentioned channel must be on this guid!"))
|
||||
} catch (Exception e) {
|
||||
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, new EmbedBuilder()
|
||||
.setTitle("Channel not found")
|
||||
.setDescription("I can't find the specified channel. Please start the setup again."))
|
||||
.build()).queue();
|
||||
}
|
||||
}
|
||||
|
|
@ -165,7 +179,7 @@ public class RulesCommand implements Command {
|
|||
|
||||
@Override
|
||||
public String[] labels() {
|
||||
return new String[]{"rules", "rule"};
|
||||
return new String[]{"rules", "rule", "setup"};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue