Improve bot permission management

Author: LucasCdry

src/main/java/net/clementraynaud/skoice/bot/Bot.java

@@ -126,17 +126,7 @@ public void connect(CommandSender sender) {
     }
 
     public boolean isAdministrator() {
-        Guild guild = this.plugin.getBot().getGuild();
-        if (guild == null) {
-            return false;
-        }
-
-        if (this.getGuild().getRequiredMFALevel() == Guild.MFALevel.TWO_FACTOR_AUTH
-                && !this.jda.getSelfUser().isMfaEnabled()) {
-            return false;
-        }
-
-        return guild.getSelfMember().hasPermission(Permission.ADMINISTRATOR);
+        return this.status.ordinal() > BotStatus.MISSING_PERMISSION.ordinal();
     }
 
     public void setDefaultAvatar() {
@@ -211,6 +201,7 @@ public void updateStatus() {
             if (!this.plugin.getConfigYamlFile().contains(ConfigField.TOKEN.toString())) {
                 this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.no-token"));
             }
+
         } else {
             if (this.guildId == null) {
                 List<Guild> guilds = this.jda.getGuilds();
@@ -224,30 +215,36 @@ public void updateStatus() {
                     this.status = BotStatus.MULTIPLE_GUILDS;
                     this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.multiple-guilds"));
                 }
+
             } else if (this.getGuild().getRequiredMFALevel() == Guild.MFALevel.TWO_FACTOR_AUTH
                     && !this.jda.getSelfUser().isMfaEnabled()) {
                 this.status = BotStatus.MFA_REQUIRED;
                 this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.two-factor-authentication"));
-            } else if (!this.isAdministrator()) {
+
+            } else if (!this.getGuild().getSelfMember().hasPermission(Permission.ADMINISTRATOR)) {
                 this.status = BotStatus.MISSING_PERMISSION;
                 this.jda.retrieveApplicationInfo().queue(applicationInfo -> {
                     applicationInfo.setRequiredScopes("applications.commands");
                     this.plugin.getLogger().severe(this.plugin.getLang().getMessage("logger.error.missing-permission", applicationInfo.getInviteUrl(Permission.ADMINISTRATOR)));
                 });
+
             } else if (!this.plugin.getConfigYamlFile().contains(ConfigField.VOICE_CHANNEL_ID.toString())) {
                 this.status = BotStatus.NO_VOICE_CHANNEL;
                 this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.no-voice-channel"));
+
             } else if (!this.plugin.getConfigYamlFile().contains(ConfigField.HORIZONTAL_RADIUS.toString())
                     || !this.plugin.getConfigYamlFile().contains(ConfigField.VERTICAL_RADIUS.toString())) {
                 this.status = BotStatus.NO_RADIUS;
                 this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.no-radius"));
+
             } else {
                 this.status = BotStatus.READY;
                 this.plugin.getServer().getScheduler().runTask(this.plugin, () -> {
                     SystemReadyEvent event = new SystemReadyEvent();
                     this.plugin.getServer().getPluginManager().callEvent(event);
                 });
             }
+
             this.updateActivity();
         }
     }

src/main/java/net/clementraynaud/skoice/bot/BotVoiceChannel.java

@@ -56,7 +56,7 @@ public VoiceChannel getVoiceChannel() {
     }
 
     public void setStatus() {
-        if (!this.plugin.getBot().isAdministrator()) {
+        if (this.plugin.getBot().isAdministrator()) {
             return;
         }
         VoiceChannel voiceChannel = this.getVoiceChannel();

src/main/java/net/clementraynaud/skoice/listeners/channel/main/GenericChannelListener.java

@@ -122,7 +122,7 @@ private void checkForValidVoiceChannel(GenericChannelEvent event) {
         this.plugin.getConfigYamlFile().remove(ConfigField.VOICE_CHANNEL_ID.toString());
         this.plugin.getListenerManager().update();
 
-        if (!event.getGuild().getSelfMember().hasPermission(Permission.VIEW_AUDIT_LOGS)) {
+        if (!this.plugin.getBot().isAdministrator()) {
             return;
         }
         event.getGuild().retrieveAuditLogs()

src/main/java/net/clementraynaud/skoice/listeners/channel/network/GenericChannelListener.java

@@ -55,7 +55,7 @@ public void onChannelDelete(ChannelDeleteEvent event) {
 
         ProximityChannels.remove(channel.getId());
 
-        if (!event.getGuild().getSelfMember().hasPermission(Permission.VIEW_AUDIT_LOGS)) {
+        if (!this.plugin.getBot().isAdministrator()) {
             return;
         }
         event.getGuild().retrieveAuditLogs()

src/main/java/net/clementraynaud/skoice/listeners/guild/GuildJoinListener.java

@@ -34,7 +34,7 @@ public GuildJoinListener(Skoice plugin) {
 
     @Override
     public void onGuildJoin(GuildJoinEvent event) {
-        if (event.getGuild().getSelfMember().hasPermission(Permission.ADMINISTRATOR)) {
+        if (this.plugin.getBot().isAdministrator()) {
             event.getGuild().getPublicRole().getManager().givePermissions(Permission.USE_APPLICATION_COMMANDS).queue();
         }
         this.plugin.getBot().updateGuild();

src/main/java/net/clementraynaud/skoice/listeners/session/ReadyListener.java

@@ -27,6 +27,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
+import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.ErrorResponse;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -66,10 +67,15 @@ public void onReady(ReadyEvent event) {
         RestAction.setDefaultFailure(throwable -> {
             if (throwable instanceof ErrorResponseException) {
                 ErrorResponseException error = (ErrorResponseException) throwable;
-                if (error.getErrorCode() == ErrorResponse.MFA_NOT_ENABLED.getCode()) {
+                if (error.getErrorCode() == ErrorResponse.MISSING_PERMISSIONS.getCode()
+                        || error.getErrorCode() == ErrorResponse.MISSING_ACCESS.getCode()
+                        || error.getErrorCode() == ErrorResponse.MFA_NOT_ENABLED.getCode()) {
                     this.plugin.getListenerManager().update();
                     return;
                 }
+            } else if (throwable instanceof PermissionException) {
+                this.plugin.getListenerManager().update();
+                return;
             }
 
             defaultFailure.accept(throwable);

src/main/java/net/clementraynaud/skoice/tasks/UpdateVoiceStateTask.java

@@ -75,8 +75,7 @@ public void run() {
         if (isMainVoiceChannel) {
             if (!this.member.getVoiceState().isGuildMuted()
                     && this.member.hasPermission(this.channel, Permission.VOICE_SPEAK, Permission.VOICE_MUTE_OTHERS)
-                    && this.channel.getGuild().getSelfMember().hasPermission(this.channel, Permission.VOICE_MUTE_OTHERS)
-                    && this.channel.getGuild().getSelfMember().hasPermission(voiceChannel.getParentCategory(), Permission.VOICE_MOVE_OTHERS)) {
+                    && this.plugin.getBot().isAdministrator()) {
                 this.member.mute(true).queue(success -> {
                     UpdateVoiceStateTask.mutedUsers.add(this.member.getId());
                     this.plugin.getTempYamlFile().set(TempYamlFile.MUTED_USERS_ID_FIELD,