diff --git a/pom.xml b/pom.xml
index bb33a12..a7a1f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,122 +1,131 @@
- 4.0.0
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
- io.rixa
- Rixa
- 3.0-SNAPSHOT
+ io.rixa
+ Rixa
+ 3.0-SNAPSHOT
-
-
- jcenter
- jcenter-bintray
- http://jcenter.bintray.com
-
-
+
+
+ jcenter
+ jcenter-bintray
+ http://jcenter.bintray.com
+
+
+ onarandombox
+ http://repo.onarandombox.com/content/groups/public/
+
+
-
-
- net.dv8tion
- JDA
- LATEST
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-yaml
- LATEST
-
-
- com.fasterxml.jackson.core
- jackson-databind
- LATEST
- compile
-
-
- com.sedmelluq
- lavaplayer
- LATEST
- compile
-
-
- mysql
- mysql-connector-java
- 5.1.38
- compile
-
-
- org.apache.commons
- commons-lang3
- 3.4
-
-
- org.projectlombok
- lombok
- 1.16.18
-
-
- org.springframework
- spring-jdbc
- 4.3.9.RELEASE
- compile
-
-
- ca.pjer
- chatter-bot-api
- 1.4.7
- compile
-
-
+
+
+ net.dv8tion
+ JDA
+ LATEST
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+ LATEST
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ LATEST
+ compile
+
+
+ com.sedmelluq
+ lavaplayer
+ LATEST
+ compile
+
+
+ mysql
+ mysql-connector-java
+ 5.1.38
+ compile
+
+
+ org.apache.commons
+ commons-lang3
+ 3.4
+
+
+ org.projectlombok
+ lombok
+ 1.16.18
+
+
+ org.springframework
+ spring-jdbc
+ 4.3.9.RELEASE
+ compile
+
+
+ ca.pjer
+ chatter-bot-api
+ 1.4.7
+ compile
+
+
+ com.dumptruckman
+ taskmin
+ 0.1.0
+
+
-
- ${project.name}-Build-${project.version}-SNAPSHOT
-
-
- src/main/resources
- true
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.5.1
-
-
- 1.8
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.0.0
-
-
- package
-
- shade
-
+
+ ${project.name}-Build-${project.version}-SNAPSHOT
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+
+ 1.8
+ UTF-8
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.0.0
+
+
+ package
+
+ shade
+
-
-
-
- false
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.0.2
-
-
-
- io.rixa.Main
-
-
-
-
-
-
+
+
+
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.0.2
+
+
+
+ io.rixa.Main
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/io/rixa/bot/commands/cmds/admin/ConfigCommand.java b/src/main/java/io/rixa/bot/commands/cmds/admin/ConfigCommand.java
index 0023af0..c5bd7b0 100644
--- a/src/main/java/io/rixa/bot/commands/cmds/admin/ConfigCommand.java
+++ b/src/main/java/io/rixa/bot/commands/cmds/admin/ConfigCommand.java
@@ -10,26 +10,28 @@ import io.rixa.bot.user.RixaUser;
import io.rixa.bot.user.manager.UserManager;
import io.rixa.bot.utils.DiscordUtils;
import io.rixa.bot.utils.MessageFactory;
-import net.dv8tion.jda.core.entities.*;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import net.dv8tion.jda.core.entities.Guild;
+import net.dv8tion.jda.core.entities.Member;
+import net.dv8tion.jda.core.entities.Role;
+import net.dv8tion.jda.core.entities.TextChannel;
+import org.apache.commons.lang3.StringUtils;
public class ConfigCommand extends Command {
- private Pagination pagination;
- public ConfigCommand(String command, RixaPermission rixaPermission, String description) {
- super(command, rixaPermission, description);
+ private Pagination pagination;
- pagination = new Pagination(Arrays.asList(
- "%pconfig set greetings ; Set channel where greeting messages are announced!",
- "%pconfig set farewell ; Set channel where farewell messages are announced!",
- "%pconfig set prefix ; Set Rixa's command prefix!",
- "%pconfig set defaultRole ; Set role to be assigned when a user joins the server!",
- "%pconfig set muteRole ; Set role to be assigned when a user is muted!",
- "%pconfig set musicRole ; Set role required to use the music functions! (Not required)",
+ public ConfigCommand(String command, RixaPermission rixaPermission, String description) {
+ super(command, rixaPermission, description);
+
+ pagination = new Pagination(Arrays.asList(
+ "%pconfig set greetings ; Set channel where greeting messages are announced!",
+ "%pconfig set farewell ; Set channel where farewell messages are announced!",
+ "%pconfig set prefix ; Set Rixa's command prefix!",
+ "%pconfig set defaultRole ; Set role to be assigned when a user joins the server!",
+ "%pconfig set muteRole ; Set role to be assigned when a user is muted!",
+ "%pconfig set musicRole ; Set role required to use the music functions! (Not required)",
/* "%pconfig set twitterCKey ; Set Twitter Consumer Key!",
"%pconfig set twitterCSecret ; Set Twitter Consumer Secret!",
@@ -37,241 +39,253 @@ public class ConfigCommand extends Command {
"%pconfig set twitterASecret ; Set Twitter Access Secret!",
"%config set twitterChannel ; Set the channel for Twitter feed updates!",*/
- "%pconfig set joinMessage ; Set the greetings message for when a user joins the server!",
- "%pconfig set quitMessage ; Set the quit message for when a user leaves the server!",
- "%pconfig set joinPm ; Set the message to be private messaged when a user joins!",
- "%pconfig set description ; Set your server description!",
- "%pconfig addPerm ; Give a role permission to access a command!",
- "%pconfig removePerm ; Remove a role's permission to access a command!",
- "%pconfig enable ; Enabled a Rixa Module!",
- "%pconfig disable ; Disable a Rixa Module!"
- ), 6);
- }
+ "%pconfig set joinMessage ; Set the greetings message for when a user joins the server!",
+ "%pconfig set quitMessage ; Set the quit message for when a user leaves the server!",
+ "%pconfig set joinPm ; Set the message to be private messaged when a user joins!",
+ "%pconfig set description ; Set your server description!",
+ "%pconfig addPerm ; Give a role permission to access a command!",
+ "%pconfig removePerm ; Remove a role's permission to access a command!",
+ "%pconfig enable ; Enabled a Rixa Module!",
+ "%pconfig disable ; Disable a Rixa Module!"
+ ), 6);
+ }
- @Override
- public void execute(String commandLabel, Guild guild, Member member, TextChannel channel, String[] args) {
- RixaGuild rixaGuild = GuildManager.getInstance().getGuild(guild);
- if (args.length == 2) {
- switch (args[0].toLowerCase()) {
- case "set":
- if (args[1].equalsIgnoreCase("greetings")) {
- rixaGuild.getSettings().setGreetings(channel);
- MessageFactory.create(channel.getAsMention()).setAuthor("Updated Greetings Channel",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- return;
- } else if (args[1].equalsIgnoreCase("farewell")) {
- rixaGuild.getSettings().setFarewell(channel);
- MessageFactory.create(channel.getAsMention()).setAuthor("Updated Farewell Channel",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- return;
- }
- }
- }
- if (args.length < 2) {
- sendHelp(member, 1, rixaGuild.getSettings().getPrefix());
+ @Override
+ public void execute(String commandLabel, Guild guild, Member member, TextChannel channel,
+ String[] args) {
+ RixaGuild rixaGuild = GuildManager.getInstance().getGuild(guild);
+ if (args.length == 2) {
+ switch (args[0].toLowerCase()) {
+ case "set":
+ if (args[1].equalsIgnoreCase("greetings")) {
+ rixaGuild.getSettings().setGreetings(channel);
+ MessageFactory.create(channel.getAsMention()).setAuthor("Updated Greetings Channel",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
return;
- }
- String string = join(args, 2, args.length);
- Role role;
- switch (args[0].toLowerCase()) {
- case "set":
- if (args[1].equalsIgnoreCase("muteRole") ||
- args[1].equalsIgnoreCase("musicRole") ||
- args[1].equalsIgnoreCase("defaultRole")) {
- role = DiscordUtils.searchFirstRole(guild, string);
- if (role == null) {
- MessageFactory.create("Sorry I could not find that role!")
- .setColor(member.getColor()).setTimestamp().queue(channel);
- // Role not found
- return;
- }
- switch(args[1].toLowerCase()) {
- case "muterole":
- rixaGuild.getSettings().setMuteRole(role);
- break;
- case "musicrole":
- ((MusicModule) rixaGuild.getModule("Music")).setMusicRole(role);
- break;
- case "defaultrole":
- rixaGuild.getSettings().setDefaultRole(role);
- break;
- }
- // Role set
- MessageFactory.create(role.getAsMention()).setAuthor("Updated Role",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("joinMessage")) {
- rixaGuild.getSettings().setJoinMessage(string);
- MessageFactory.create(string).setAuthor("Updated Join Message",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("quitMessage")) {
- rixaGuild.getSettings().setQuitMessage(string);
- MessageFactory.create(string).setAuthor("Updated Quit Message",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("joinPm")) {
- rixaGuild.getSettings().setJoinPrivateMessage(string);
- MessageFactory.create(string).setAuthor("Updated Join Private Message",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("description")) {
- rixaGuild.setDescription(string);
- MessageFactory.create(string).setAuthor("Updated Guild Server Description",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("prefix")) {
- rixaGuild.getSettings().setPrefix(string);
- MessageFactory.create(string).setAuthor("Updated Command Prefix",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else {
- sendHelp(member, 1, rixaGuild.getSettings().getPrefix());
- return;
- }
- break;
- case "enable":
- if (rixaGuild.isRegistered(args[1].toLowerCase())) {
- rixaGuild.getModule(args[1].toLowerCase()).setEnabled(true);
- MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Enabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("joinVerification")) {
- rixaGuild.getSettings().setJoinVerification(true);
- MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Enabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else {
- MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Not Found",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- }
- break;
- case "disable":
- if (rixaGuild.isRegistered(args[1])) {
- rixaGuild.getModule(args[1]).setEnabled(false);
- MessageFactory.create(args[1]).setAuthor("Module Disabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("joinMessage")) {
- rixaGuild.getSettings().setJoinMessage("default_value");
- MessageFactory.create(args[1]).setAuthor("Module Disabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("quitMessage")) {
- rixaGuild.getSettings().setQuitMessage("default_value");
- MessageFactory.create(args[1]).setAuthor("Module Disabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("joinPrivateMessage")) {
- rixaGuild.getSettings().setJoinPrivateMessage("default");
- MessageFactory.create(args[1]).setAuthor("Module Disabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else if (args[1].equalsIgnoreCase("joinVerification")) {
- rixaGuild.getSettings().setJoinVerification(false);
- MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Disabled",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- } else {
- MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Not Found",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- }
- break;
- case "addperm":
- case "aperm":
- case "addpermission":
- case "addperms":
- case "addpermissions":
- RixaPermission permission = searchPerms(args);
- if (permission == null) {
- MessageFactory.create("That permission does not exist!").setColor(member.getColor()).queue(channel);
- return;
- }
- if (args[1].equalsIgnoreCase("role")) {
- role = DiscordUtils.searchFirstRole(guild, string);
- if (role == null) {
- MessageFactory.create("That role does not exist!").setColor(member.getColor()).queue(channel);
- return;
- }
- rixaGuild.addPermission(role.getId(), permission);
- MessageFactory.create("Role: " + role.getAsMention() + " | Permission: " +
- permission.toString()).setAuthor("Permission Given",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- return;
- }
- if (args[1].equalsIgnoreCase("user")) {
- List targets = DiscordUtils.memberSearch(guild, string, false);
- if (targets.isEmpty()) {
- MessageFactory.create("Could not find that user!").setColor(member.getColor()).queue(channel);
- return;
- }
- RixaUser targetUser = UserManager.getInstance().getUser(targets.get(0).getUser());
- targetUser.addPermission(guild.getId(), permission);
- MessageFactory.create("User: " + targetUser.getUser().getAsMention() + " | Permission: " +
- permission.toString()).setAuthor("Permission Given",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- return;
- }
- MessageFactory.create("Incorrect Usage! Try " + commandLabel + " addPerm !").setColor(member.getColor())
- .queue(channel);
- break;
- case "removeperm":
- case "rperm":
- case "removepermissions":
- case "removeperms":
- permission = searchPerms(args);
- if (permission == null) {
- MessageFactory.create("That permission does not exist!").setColor(member.getColor()).queue(channel);
- return;
- }
- if (args[1].equalsIgnoreCase("role")) {
- role = DiscordUtils.searchFirstRole(guild, string);
- if (role == null) {
- MessageFactory.create("That role does not exist!").setColor(member.getColor()).queue(channel);
- return;
- }
- rixaGuild.removePermission(role.getId(), permission);
- MessageFactory.create("Role: " + role.getAsMention() + " | Permission: " +
- permission.toString()).setAuthor("Permission Revoked",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- return;
- }
- if (args[1].equalsIgnoreCase("user")) {
- List targets = DiscordUtils.memberSearch(guild, string, false);
- if (targets.isEmpty()) {
- MessageFactory.create("Could not find that user!").setColor(member.getColor()).queue(channel);
- return;
- }
- RixaUser targetUser = UserManager.getInstance().getUser(targets.get(0).getUser());
- targetUser.removePermission(guild.getId(), permission);
- MessageFactory.create("Role: " + targetUser.getUser().getAsMention() + " | Permission: " +
- permission.toString()).setAuthor("Permission Revoked",
- guild.getIconUrl()).setColor(member.getColor()).queue(channel);
- return;
- }
- MessageFactory.create("Incorrect Usage! Try " + commandLabel + " addPerm !").setColor(member.getColor())
- .queue(channel);
- break;
- default:
- sendHelp(member, 1, rixaGuild.getSettings().getPrefix());
- break;
- }
+ } else if (args[1].equalsIgnoreCase("farewell")) {
+ rixaGuild.getSettings().setFarewell(channel);
+ MessageFactory.create(channel.getAsMention()).setAuthor("Updated Farewell Channel",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ return;
+ }
+ }
}
+ if (args.length < 2) {
+ sendHelp(member, 1, rixaGuild.getSettings().getPrefix());
+ return;
+ }
+ String string = join(args, 2, args.length);
+ Role role;
+ switch (args[0].toLowerCase()) {
+ case "set":
+ if (args[1].equalsIgnoreCase("muteRole") ||
+ args[1].equalsIgnoreCase("musicRole") ||
+ args[1].equalsIgnoreCase("defaultRole")) {
+ role = DiscordUtils.searchFirstRole(guild, string);
+ if (role == null) {
+ MessageFactory.create("Sorry I could not find that role!")
+ .setColor(member.getColor()).setTimestamp().queue(channel);
+ // Role not found
+ return;
+ }
+ switch (args[1].toLowerCase()) {
+ case "muterole":
+ rixaGuild.getSettings().setMuteRole(role);
+ break;
+ case "musicrole":
+ ((MusicModule) rixaGuild.getModule("Music")).setMusicRole(role);
+ break;
+ case "defaultrole":
+ rixaGuild.getSettings().setDefaultRole(role);
+ break;
+ }
+ // Role set
+ MessageFactory.create(role.getAsMention()).setAuthor("Updated Role",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("joinMessage")) {
+ rixaGuild.getSettings().setJoinMessage(string);
+ MessageFactory.create(string).setAuthor("Updated Join Message",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("quitMessage")) {
+ rixaGuild.getSettings().setQuitMessage(string);
+ MessageFactory.create(string).setAuthor("Updated Quit Message",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("joinPm")) {
+ rixaGuild.getSettings().setJoinPrivateMessage(string);
+ MessageFactory.create(string).setAuthor("Updated Join Private Message",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("description")) {
+ rixaGuild.setDescription(string);
+ MessageFactory.create(string).setAuthor("Updated Guild Server Description",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("prefix")) {
+ rixaGuild.getSettings().setPrefix(string);
+ MessageFactory.create(string).setAuthor("Updated Command Prefix",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else {
+ sendHelp(member, 1, rixaGuild.getSettings().getPrefix());
+ return;
+ }
+ break;
+ case "enable":
+ if (rixaGuild.isRegistered(args[1].toLowerCase())) {
+ rixaGuild.getModule(args[1].toLowerCase()).setEnabled(true);
+ MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Enabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("joinVerification")) {
+ rixaGuild.getSettings().setJoinVerification(true);
+ MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Enabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else {
+ MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Not Found",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ }
+ break;
+ case "disable":
+ if (rixaGuild.isRegistered(args[1])) {
+ rixaGuild.getModule(args[1]).setEnabled(false);
+ MessageFactory.create(args[1]).setAuthor("Module Disabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("joinMessage")) {
+ rixaGuild.getSettings().setJoinMessage("default_value");
+ MessageFactory.create(args[1]).setAuthor("Module Disabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("quitMessage")) {
+ rixaGuild.getSettings().setQuitMessage("default_value");
+ MessageFactory.create(args[1]).setAuthor("Module Disabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("joinPrivateMessage")) {
+ rixaGuild.getSettings().setJoinPrivateMessage("default");
+ MessageFactory.create(args[1]).setAuthor("Module Disabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else if (args[1].equalsIgnoreCase("joinVerification")) {
+ rixaGuild.getSettings().setJoinVerification(false);
+ MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Disabled",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ } else {
+ MessageFactory.create(args[1].toLowerCase()).setAuthor("Module Not Found",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ }
+ break;
+ case "addperm":
+ case "aperm":
+ case "addpermission":
+ case "addperms":
+ case "addpermissions":
+ RixaPermission permission = searchPerms(args);
+ if (permission == null) {
+ MessageFactory.create("That permission does not exist!").setColor(member.getColor())
+ .queue(channel);
+ return;
+ }
+ if (args[1].equalsIgnoreCase("role")) {
+ role = DiscordUtils.searchFirstRole(guild, string);
+ if (role == null) {
+ MessageFactory.create("That role does not exist!").setColor(member.getColor())
+ .queue(channel);
+ return;
+ }
+ rixaGuild.addPermission(role.getId(), permission);
+ MessageFactory.create("Role: " + role.getAsMention() + " | Permission: " +
+ permission.toString()).setAuthor("Permission Given",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ return;
+ }
+ if (args[1].equalsIgnoreCase("user")) {
+ List targets = DiscordUtils.memberSearch(guild, string, false);
+ if (targets.isEmpty()) {
+ MessageFactory.create("Could not find that user!").setColor(member.getColor())
+ .queue(channel);
+ return;
+ }
+ RixaUser targetUser = UserManager.getInstance().getUser(targets.get(0).getUser());
+ targetUser.addPermission(guild.getId(), permission);
+ MessageFactory.create("User: " + targetUser.getUser().getAsMention() + " | Permission: " +
+ permission.toString()).setAuthor("Permission Given",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ return;
+ }
+ MessageFactory
+ .create("Incorrect Usage! Try " + commandLabel + " addPerm !")
+ .setColor(member.getColor())
+ .queue(channel);
+ break;
+ case "removeperm":
+ case "rperm":
+ case "removepermissions":
+ case "removeperms":
+ permission = searchPerms(args);
+ if (permission == null) {
+ MessageFactory.create("That permission does not exist!").setColor(member.getColor())
+ .queue(channel);
+ return;
+ }
+ if (args[1].equalsIgnoreCase("role")) {
+ role = DiscordUtils.searchFirstRole(guild, string);
+ if (role == null) {
+ MessageFactory.create("That role does not exist!").setColor(member.getColor())
+ .queue(channel);
+ return;
+ }
+ rixaGuild.removePermission(role.getId(), permission);
+ MessageFactory.create("Role: " + role.getAsMention() + " | Permission: " +
+ permission.toString()).setAuthor("Permission Revoked",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ return;
+ }
+ if (args[1].equalsIgnoreCase("user")) {
+ List targets = DiscordUtils.memberSearch(guild, string, false);
+ if (targets.isEmpty()) {
+ MessageFactory.create("Could not find that user!").setColor(member.getColor())
+ .queue(channel);
+ return;
+ }
+ RixaUser targetUser = UserManager.getInstance().getUser(targets.get(0).getUser());
+ targetUser.removePermission(guild.getId(), permission);
+ MessageFactory.create("Role: " + targetUser.getUser().getAsMention() + " | Permission: " +
+ permission.toString()).setAuthor("Permission Revoked",
+ guild.getIconUrl()).setColor(member.getColor()).queue(channel);
+ return;
+ }
+ MessageFactory
+ .create("Incorrect Usage! Try " + commandLabel + " addPerm !")
+ .setColor(member.getColor())
+ .queue(channel);
+ break;
+ default:
+ sendHelp(member, 1, rixaGuild.getSettings().getPrefix());
+ break;
+ }
+ }
- private void sendHelp(Member member, int page, String prefix) {
- List