Fix permission errors with staff commands

Author: TechnoVisionDev

src/main/java/technobot/commands/staff/BanCommand.java

@@ -14,6 +14,7 @@
 import technobot.commands.Category;
 import technobot.commands.Command;
 import technobot.data.GuildData;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedColor;
 import technobot.util.embeds.EmbedUtils;
 
@@ -55,7 +56,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission) || member.isOwner()) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission) || member.isOwner()) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't ban that user. Please check my permissions and role position.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/ClearCommand.java

@@ -9,6 +9,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedUtils;
 
 import java.util.concurrent.TimeUnit;
@@ -37,7 +38,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't delete those messages. Please check my role and channel permissions.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/KickCommand.java

@@ -12,6 +12,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedColor;
 import technobot.util.embeds.EmbedUtils;
 
@@ -52,7 +53,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission) || target.isOwner()) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission) || target.isOwner()) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't kick that user. Please check my permissions and role position.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/LockCommand.java

@@ -10,6 +10,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedUtils;
 
 /**
@@ -32,7 +33,7 @@ public LockCommand(TechnoBot bot) {
     public void execute(SlashCommandInteractionEvent event) {
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't lock that channel. Please check my role and channel permissions.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/RoleCommand.java

@@ -9,6 +9,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedUtils;
 
 /**
@@ -43,7 +44,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.replyEmbeds(EmbedUtils.createError("I couldn't change the roles for that user. Please check my permissions and role position.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/SetNickCommand.java

@@ -11,6 +11,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedUtils;
 
 /**
@@ -40,7 +41,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't change that user's nickname. Please check my permissions and role position.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/SlowmodeCommand.java

@@ -10,6 +10,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedUtils;
 
 import java.time.Duration;
@@ -35,7 +36,7 @@ public SlowmodeCommand(TechnoBot bot) {
     public void execute(SlashCommandInteractionEvent event) {
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.replyEmbeds(EmbedUtils.createError("I couldn't set slowmode here. Please check my role and channel permissions.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/UnbanCommand.java

@@ -10,6 +10,7 @@
 import technobot.commands.Category;
 import technobot.commands.Command;
 import technobot.data.GuildData;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedColor;
 import technobot.util.embeds.EmbedUtils;
 
@@ -35,7 +36,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't unban that user. Please check my permissions and role position.")).queue();
             return;
         }

src/main/java/technobot/commands/staff/UnlockCommand.java

@@ -10,6 +10,7 @@
 import technobot.TechnoBot;
 import technobot.commands.Category;
 import technobot.commands.Command;
+import technobot.util.UtilityMethods;
 import technobot.util.embeds.EmbedUtils;
 
 /**
@@ -32,7 +33,7 @@ public UnlockCommand(TechnoBot bot) {
     public void execute(SlashCommandInteractionEvent event) {
         // Check that bot has necessary permissions
         Role botRole = event.getGuild().getBotRole();
-        if (!botRole.hasPermission(this.permission)) {
+        if (!UtilityMethods.hasPermission(botRole, this.permission)) {
             event.getHook().sendMessageEmbeds(EmbedUtils.createError("I couldn't unlock that channel. Please check my role and channel permissions.")).queue();
             return;
         }

src/main/java/technobot/listeners/GuildListener.java

@@ -6,6 +6,12 @@
 import technobot.commands.CommandRegistry;
 import technobot.data.GuildData;
 
+/**
+ * Listens for guild event
+ * Only really used for guild command registration at the moment.
+ *
+ * @author TechnoVision
+ */
 public class GuildListener extends ListenerAdapter {
 
     /**