Improve lobby selection logic

Author: LucasCdry

Diff for: src/main/java/net/clementraynaud/skoice/bot/BotVoiceChannel.java

@@ -20,10 +20,13 @@
 package net.clementraynaud.skoice.bot;
 
 import net.clementraynaud.skoice.Skoice;
+import net.clementraynaud.skoice.storage.config.ConfigField;
+import net.clementraynaud.skoice.tasks.InterruptSystemTask;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.PermissionOverride;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 
 import java.util.EnumSet;
@@ -36,6 +39,18 @@ public BotVoiceChannel(Skoice plugin) {
         this.plugin = plugin;
     }
 
+    public void setup(VoiceChannel channel, User user) {
+        VoiceChannel oldVoiceChannel = this.plugin.getConfigYamlFile().getVoiceChannel();
+        if (oldVoiceChannel != null) {
+            oldVoiceChannel.modifyStatus("").queue();
+            new InterruptSystemTask(this.plugin).run();
+        }
+        this.plugin.getConfigYamlFile().set(ConfigField.VOICE_CHANNEL_ID.toString(), channel.getId());
+        this.plugin.getListenerManager().update(user);
+        this.plugin.getBot().getVoiceChannel().updatePermissions();
+        this.plugin.getBot().getVoiceChannel().setStatus();
+    }
+
     public VoiceChannel getVoiceChannel() {
         return this.plugin.getConfigYamlFile().getVoiceChannel();
     }

Diff for: src/main/java/net/clementraynaud/skoice/listeners/interaction/ModalInteractionListener.java

@@ -23,9 +23,7 @@
 import net.clementraynaud.skoice.menus.ConfigurationMenus;
 import net.clementraynaud.skoice.menus.EmbeddedMenu;
 import net.clementraynaud.skoice.storage.config.ConfigField;
-import net.clementraynaud.skoice.tasks.InterruptSystemTask;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
@@ -59,16 +57,7 @@ public void onModalInteraction(ModalInteractionEvent event) {
             String voiceChannelName = voiceChannelValue.getAsString();
             guild.createCategory(categoryName).queue(category ->
                     guild.createVoiceChannel(voiceChannelName, category).queue(channel -> {
-                        VoiceChannel oldVoiceChannel = this.plugin.getConfigYamlFile().getVoiceChannel();
-                        if (oldVoiceChannel != null) {
-                            oldVoiceChannel.modifyStatus("").queue();
-                        }
-                        this.plugin.getConfigYamlFile().set(ConfigField.VOICE_CHANNEL_ID.toString(), channel.getId());
-                        new InterruptSystemTask(this.plugin).run();
-                        this.plugin.getListenerManager().update(event.getUser());
-                        this.plugin.getBot().getVoiceChannel().updatePermissions();
-                        this.plugin.getBot().getVoiceChannel().setStatus();
-                        this.plugin.getLinksYamlFile().refreshOnlineLinkedPlayers();
+                        this.plugin.getBot().getVoiceChannel().setup(channel, event.getUser());
                         ConfigurationMenus.getFromMessageId(event.getMessage().getId()).ifPresent(menu -> menu.refreshId().edit(event));
                     }));
 

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

@@ -25,7 +25,6 @@
 import net.clementraynaud.skoice.menus.ConfigurationMenus;
 import net.clementraynaud.skoice.menus.EmbeddedMenu;
 import net.clementraynaud.skoice.storage.config.ConfigField;
-import net.clementraynaud.skoice.tasks.InterruptSystemTask;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
@@ -118,18 +117,7 @@ public void onStringSelectInteraction(StringSelectInteractionEvent event) {
                         } else {
                             VoiceChannel voiceChannel = guild.getVoiceChannelById(event.getSelectedOptions().get(0).getValue());
                             if (voiceChannel != null && voiceChannel.getParentCategory() != null) {
-                                VoiceChannel oldVoiceChannel = this.plugin.getConfigYamlFile().getVoiceChannel();
-                                if (oldVoiceChannel != null) {
-                                    oldVoiceChannel.modifyStatus("").queue();
-                                }
-                                this.plugin.getConfigYamlFile().set(ConfigField.VOICE_CHANNEL_ID.toString(),
-                                        event.getSelectedOptions().get(0).getValue());
-                                this.plugin.getBot().updateVoiceState();
-                                new InterruptSystemTask(this.plugin).run();
-                                this.plugin.getListenerManager().update(event.getUser());
-                                this.plugin.getBot().getVoiceChannel().updatePermissions();
-                                this.plugin.getBot().getVoiceChannel().setStatus();
-                                this.plugin.getLinksYamlFile().refreshOnlineLinkedPlayers();
+                                this.plugin.getBot().getVoiceChannel().setup(voiceChannel, event.getUser());
                             }
                             ConfigurationMenus.getFromMessageId(event.getMessage().getId()).ifPresent(menu -> menu.refreshId().edit(event));
                         }

Diff for: src/main/java/net/clementraynaud/skoice/listeners/session/ReadyListener.java

@@ -109,7 +109,6 @@ private void setup(Player tokenManager) {
         );
 
         this.plugin.getConfigYamlFile().removeInvalidVoiceChannelId();
-        this.plugin.getLinksYamlFile().refreshOnlineLinkedPlayers();
 
         this.plugin.getBot().setDefaultAvatar();
         this.plugin.getBot().updateGuild();

Diff for: src/main/java/net/clementraynaud/skoice/system/LinkedPlayer.java

@@ -103,7 +103,7 @@ public Set<LinkedPlayer> getPlayersWithinRange() {
             }
         } catch (NullPointerException ignored) {
         }
-        return LinkedPlayer.getOnlineLinkedPlayers().stream()
+        return LinkedPlayer.onlineLinkedPlayers.stream()
                 .filter(p -> p.isInMainVoiceChannel() || p.isInAnyProximityChannel())
                 .filter(p -> !p.equals(this))
                 .filter(LinkedPlayer::isStateEligible)

Diff for: src/main/java/net/clementraynaud/skoice/system/ListenerManager.java

@@ -73,6 +73,7 @@ public void update(User user) {
         if (oldStatus != BotStatus.READY && newStatus == BotStatus.READY) {
             this.registerMinecraftListeners();
             this.registerBotListeners();
+            this.plugin.getLinksYamlFile().refreshOnlineLinkedPlayers();
             this.plugin.getBot().getVoiceChannel().notifyUnlinkedUsers();
             this.plugin.getLogger().info(this.plugin.getLang().getMessage("logger.info.configuration-complete"));
             if (user != null) {