Rework guild cache

Author: LucasCdry

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

@@ -159,11 +159,6 @@ public void notifyIfUnlinked(Member member) {
         }
     }
 
-    public void updateGuild() {
-        List<Guild> guilds = this.jda.getGuilds();
-        this.guildId = guilds.size() == 1 ? guilds.get(0).getId() : null;
-    }
-
     public void retrieveMutedUsers() {
         UpdateVoiceStateTask.getMutedUsers().clear();
         UpdateVoiceStateTask.getMutedUsers().addAll(this.plugin.getTempYamlFile().getStringList(TempYamlFile.MUTED_USERS_ID_FIELD));
@@ -203,46 +198,48 @@ public void updateStatus() {
             }
 
         } else {
-            if (this.guildId == null) {
-                List<Guild> guilds = this.jda.getGuilds();
-                if (guilds.isEmpty()) {
-                    this.status = BotStatus.NO_GUILD;
-                    this.jda.retrieveApplicationInfo().queue(applicationInfo -> {
-                        applicationInfo.setRequiredScopes("applications.commands");
-                        this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.no-guild", applicationInfo.getInviteUrl(Permission.ADMINISTRATOR)));
-                    });
-                } else if (guilds.size() > 1) {
-                    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"));
+            List<Guild> guilds = this.jda.getGuilds();
 
-            } else if (!this.getGuild().getSelfMember().hasPermission(Permission.ADMINISTRATOR)) {
-                this.status = BotStatus.MISSING_PERMISSION;
+            if (guilds.isEmpty()) {
+                this.status = BotStatus.NO_GUILD;
                 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)));
+                    this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.no-guild", applicationInfo.getInviteUrl(Permission.ADMINISTRATOR)));
                 });
+            } else if (guilds.size() > 1) {
+                this.status = BotStatus.MULTIPLE_GUILDS;
+                this.plugin.getLogger().warning(this.plugin.getLang().getMessage("logger.warning.multiple-guilds"));
+            } else {
+                this.guildId = guilds.get(0).getId();
+
+                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.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.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 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);
-                });
+                } 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/listeners/guild/GuildJoinListener.java

@@ -37,7 +37,6 @@ public void onGuildJoin(GuildJoinEvent event) {
         if (this.plugin.getBot().isAdministrator()) {
             event.getGuild().getPublicRole().getManager().givePermissions(Permission.USE_APPLICATION_COMMANDS).queue();
         }
-        this.plugin.getBot().updateGuild();
         this.plugin.getListenerManager().update();
     }
 }

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

@@ -33,7 +33,6 @@ public GuildLeaveListener(Skoice plugin) {
 
     @Override
     public void onGuildLeave(GuildLeaveEvent event) {
-        this.plugin.getBot().updateGuild();
         this.plugin.getListenerManager().update();
     }
 }

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

@@ -121,7 +121,6 @@ private void setup(Player tokenManager) {
         this.plugin.getConfigYamlFile().removeInvalidVoiceChannelId();
 
         this.plugin.getBot().setDefaultAvatar();
-        this.plugin.getBot().updateGuild();
         this.plugin.getBot().retrieveMutedUsers();
         this.plugin.getBot().getMenuFactory().loadAll(this.plugin);