Fix bugs related to bot status

Author: LucasCdry

src/main/java/net/clementraynaud/skoice/listeners/interaction/component/StringSelectInteractionListener.java

@@ -77,12 +77,17 @@ public void onStringSelectInteraction(StringSelectInteractionEvent event) {
                             }
 
                             if (guild.getId().equals(server.getValue())) {
-                                ConfigurationMenus.getFromMessageId(event.getMessageId()).ifPresent(menu -> menu.deleteFromHook(success -> guildToLeave.leave().queue()));
+                                ConfigurationMenus.getFromMessageId(event.getMessageId())
+                                        .ifPresent(menu -> menu.delete(event, success -> guildToLeave.leave().queue()));
                             } else {
                                 guildToLeave.leave().queue();
                             }
                         }
                     }
+
+                    if (!event.isAcknowledged()) {
+                        ConfigurationMenus.getFromMessageId(event.getMessageId()).ifPresent(menu -> menu.refreshId().edit(event));
+                    }
                     break;
 
                 case "language-selection":

src/main/java/net/clementraynaud/skoice/menus/EmbeddedMenu.java

@@ -84,14 +84,11 @@ public void editFromHook() {
                 .queue(null, new ErrorHandler().handle(ErrorResponse.UNKNOWN_MESSAGE, e -> this.forget()));
     }
 
-    public void deleteFromHook(Consumer<Void> success) {
-        if (this.hook == null || this.hook.isExpired()) {
-            return;
-        }
-
-        this.hook.deleteOriginal()
-                .queue(success.andThen(e -> this.forget()), new ErrorHandler().handle(ErrorResponse.UNKNOWN_MESSAGE, e -> this.forget()));
-        this.hook = null;
+    public void delete(IMessageEditCallback interaction, Consumer<Void> success) {
+        interaction.getHook().deleteOriginal()
+                .queue(success.andThen(e -> this.forget()),
+                        new ErrorHandler().handle(ErrorResponse.UNKNOWN_MESSAGE, e -> this.forget())
+                );
     }
 
     protected void forget() {

src/main/java/net/clementraynaud/skoice/system/ListenerManager.java

@@ -81,14 +81,12 @@ public void update(User user) {
                                 this.plugin.getBot().getCommands().getAsMention(CommandInfo.LINK.toString()))
                         .message(user);
             }
-        } else if (newStatus != BotStatus.READY) {
-            if (oldStatus == BotStatus.READY) {
-                this.unregisterMinecraftListeners();
-                if (newStatus != BotStatus.NOT_CONNECTED) {
-                    this.unregisterBotListeners();
-                }
+        } else if (oldStatus == BotStatus.READY && newStatus != BotStatus.READY) {
+            this.unregisterMinecraftListeners();
+            if (newStatus != BotStatus.NOT_CONNECTED) {
+                this.unregisterBotListeners();
+                new InterruptSystemTask(this.plugin).run();
             }
-            new InterruptSystemTask(this.plugin).run();
         }
     }
 

src/main/java/net/clementraynaud/skoice/system/ProximityChannels.java

@@ -106,6 +106,16 @@ public static void clean(int possibleUsers) {
                 });
     }
 
+    public static void clear() {
+        try {
+            if (Bukkit.isPrimaryThread() && Bukkit.getPluginManager().isPluginEnabled("Skoice")) {
+                new IllegalStateException("This method should not be called from the main thread.").printStackTrace();
+            }
+        } catch (NullPointerException ignored) {
+        }
+        ProximityChannels.proximityChannelSet.clear();
+    }
+
     public static boolean isProximityChannel(String voiceChannelId) {
         return ProximityChannels.getInitialized().stream()
                 .map(ProximityChannel::getChannelId)

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

@@ -25,6 +25,8 @@
 import net.clementraynaud.skoice.system.Networks;
 import net.clementraynaud.skoice.system.ProximityChannel;
 import net.clementraynaud.skoice.system.ProximityChannels;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.internal.utils.tuple.Pair;
@@ -51,31 +53,38 @@ public void run() {
             value.getRight().cancel(true);
         }
 
-        VoiceChannel voiceChannel = this.plugin.getConfigYamlFile().getVoiceChannel();
+        Guild guild = this.plugin.getBot().getGuild();
 
-        if (this.plugin.getBot().isAdministrator()) {
+        if (guild != null
+                && guild.getSelfMember().hasPermission(Permission.ADMINISTRATOR)
+                && (guild.getRequiredMFALevel() != Guild.MFALevel.TWO_FACTOR_AUTH
+                || this.plugin.getBot().getJDA().getSelfUser().isMfaEnabled())) {
+            VoiceChannel voiceChannel = this.plugin.getConfigYamlFile().getVoiceChannel();
             for (ProximityChannel proximityChannel : ProximityChannels.getInitialized()) {
                 if (voiceChannel != null) {
                     for (int i = 0; i < proximityChannel.getChannel().getMembers().size(); i++) {
                         Member member = proximityChannel.getChannel().getMembers().get(i);
-                        if (i + 1 < proximityChannel.getChannel().getMembers().size()
-                                || this.plugin.isEnabled()) {
+                        if (i + 1 < proximityChannel.getChannel().getMembers().size()) {
                             member.getGuild()
                                     .moveVoiceMember(member, voiceChannel)
                                     .queue();
+                        } else if (this.plugin.isEnabled()) {
+                            member.getGuild()
+                                    .moveVoiceMember(member, voiceChannel)
+                                    .queue(sucess -> proximityChannel.delete());
                         } else {
                             member.getGuild()
                                     .moveVoiceMember(member, voiceChannel)
                                     .complete();
+                            proximityChannel.delete();
                         }
                     }
                 }
-                proximityChannel.delete();
             }
         }
 
-        Networks.getAll().forEach(Network::clear);
         Networks.clear();
+        ProximityChannels.clear();
 
         if (this.plugin.isEnabled()) {
             this.plugin.getServer().getScheduler().runTask(this.plugin, () -> {