izebra_projects/Rixa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commands no longer require mentioning of roles

Browse Source
This commit is contained in:
Savvy 2017-10-03 09:34:19 -04:00
parent 6f1ddc19a9
commit 089c1a2fb8
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/savvy/rixa/commands/admin/ConfigCommand.java
View File

@ -8,6 +8,7 @@ import me.savvy.rixa.guild.RixaGuild;
import me.savvy.rixa.guild.management.Guilds; import me.savvy.rixa.guild.management.Guilds;
import me.savvy.rixa.modules.music.MusicModule; import me.savvy.rixa.modules.music.MusicModule;
import me.savvy.rixa.utils.MessageBuilder; import me.savvy.rixa.utils.MessageBuilder;
import me.savvy.rixa.utils.Utils;
import net.dv8tion.jda.core.entities.ChannelType; import net.dv8tion.jda.core.entities.ChannelType;
import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.Member;
import net.dv8tion.jda.core.entities.Role; import net.dv8tion.jda.core.entities.Role;
@ -143,30 +144,30 @@ public class ConfigCommand implements CommandExec {
rixaGuild.getGuildSettings().setPrefix(pref); rixaGuild.getGuildSettings().setPrefix(pref);
new MessageBuilder("Successfully updated command prefix!").setColor(event.getMember().getColor()).queue(event.getChannel()); new MessageBuilder("Successfully updated command prefix!").setColor(event.getMember().getColor()).queue(event.getChannel());
} else if (messages[2].equalsIgnoreCase("defaultRole")) { } else if (messages[2].equalsIgnoreCase("defaultRole")) {
if (event.getMessage().getMentionedRoles().size() < 1) { if (Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).size() < 1) {
new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " set defaultRole <role>].\nMake sure to mention the role!") new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " set defaultRole <role>].\nMake sure to mention the role!")
.setColor(event.getMember().getColor()).queue(event.getChannel()); .setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;
} }
Role role = event.getMessage().getMentionedRoles().get(0); Role role = Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).get(0);
rixaGuild.getGuildSettings().setDefaultRole(role.getId()); rixaGuild.getGuildSettings().setDefaultRole(role.getId());
new MessageBuilder("Successfully set default role to " + role.getName() + "!").setColor(event.getMember().getColor()).queue(event.getChannel()); new MessageBuilder("Successfully set default role to " + role.getName() + "!").setColor(event.getMember().getColor()).queue(event.getChannel());
} else if (messages[2].equalsIgnoreCase("muteRole")) { } else if (messages[2].equalsIgnoreCase("muteRole")) {
if (event.getMessage().getMentionedRoles().size() < 1) { if (Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).size() < 1) {
new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " set muteRole <role>].") new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " set muteRole <role>].")
.setColor(event.getMember().getColor()).queue(event.getChannel()); .setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;
} }
Role role = event.getMessage().getMentionedRoles().get(0); Role role = Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).get(0);
rixaGuild.getGuildSettings().setMuteRole(role.getId()); rixaGuild.getGuildSettings().setMuteRole(role.getId());
new MessageBuilder("Successfully set mute role to " + role.getName() + "!").setColor(event.getMember().getColor()).queue(event.getChannel()); new MessageBuilder("Successfully set mute role to " + role.getName() + "!").setColor(event.getMember().getColor()).queue(event.getChannel());
} else if (messages[2].equalsIgnoreCase("musicRole")) { } else if (messages[2].equalsIgnoreCase("musicRole")) {
if (event.getMessage().getMentionedRoles().size() < 1) { if (Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).size() < 1) {
new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " set musicRole <role>].") new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " set musicRole <role>].")
.setColor(event.getMember().getColor()).queue(event.getChannel()); .setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;
} }
Role role = event.getMessage().getMentionedRoles().get(0); Role role = Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).get(0);
((MusicModule) rixaGuild.getModule("Music")).setMusicRole(role.getId()); ((MusicModule) rixaGuild.getModule("Music")).setMusicRole(role.getId());
new MessageBuilder("Successfully set music role to " + role.getName() + "!").setColor(event.getMember().getColor()).queue(event.getChannel()); new MessageBuilder("Successfully set music role to " + role.getName() + "!").setColor(event.getMember().getColor()).queue(event.getChannel());
} }
@ -213,13 +214,13 @@ public class ConfigCommand implements CommandExec {
return; return;
} }
if (event.getMessage().getMentionedRoles().size() == 0) { if (Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).size() == 0) {
new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " addPerm <role> <permission>].") new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " addPerm <role> <permission>].")
.setColor(event.getMember().getColor()).queue(event.getChannel()); .setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;
} }
RixaPermission perm = RixaPermission.valueOf(permission.toUpperCase()); RixaPermission perm = RixaPermission.valueOf(permission.toUpperCase());
Role role = event.getMessage().getMentionedRoles().get(0); Role role = Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).get(0);
if (rixaGuild.hasPermission(role, perm)) { if (rixaGuild.hasPermission(role, perm)) {
new MessageBuilder("That role already has this permission!").setColor(event.getMember().getColor()).queue(event.getChannel()); new MessageBuilder("That role already has this permission!").setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;
@ -243,12 +244,12 @@ public class ConfigCommand implements CommandExec {
return; return;
} }
RixaPermission perm = RixaPermission.valueOf(permission.toUpperCase()); RixaPermission perm = RixaPermission.valueOf(permission.toUpperCase());
if (event.getMessage().getMentionedRoles().size() == 0) { if (Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).size() == 0) {
new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " removePerm <role> <permission>].") new MessageBuilder(event.getMember().getAsMention() + ", incorrect usage try [" + messages[0] + " removePerm <role> <permission>].")
.setColor(event.getMember().getColor()).queue(event.getChannel()); .setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;
} }
Role role = event.getMessage().getMentionedRoles().get(0); Role role = Utils.roleSearch(event.getGuild(), event.getMessage().getContent()).get(0);
if (!rixaGuild.hasPermission(role, perm)) { if (!rixaGuild.hasPermission(role, perm)) {
new MessageBuilder("That role doesn't have this permission!").setColor(event.getMember().getColor()).queue(event.getChannel()); new MessageBuilder("That role doesn't have this permission!").setColor(event.getMember().getColor()).queue(event.getChannel());
return; return;