Fix "Server Selection" menu

Author: LucasCdry

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

@@ -67,16 +67,19 @@ public void onStringSelectInteraction(StringSelectInteractionEvent event) {
 
             switch (componentId) {
                 case "server-selection":
-                    if (this.plugin.getBot().getJDA().getGuildById(event.getSelectedOptions().get(0).getValue()) != null) {
+                    String selectedGuildId = event.getSelectedOptions().get(0).getValue();
+
+                    if (this.plugin.getBot().getJDA().getGuildById(selectedGuildId) != null) {
                         for (SelectOption server : options) {
                             Guild guildToLeave = this.plugin.getBot().getJDA().getGuildById(server.getValue());
-                            if (guildToLeave != null && !event.getSelectedOptions().get(0).getValue().equals(server.getValue())) {
-                                if (guild.getId().equals(server.getValue())) {
-                                    ConfigurationMenus.getFromMessageId(event.getMessageId()).ifPresent(menu -> menu.deleteFromHook(success -> guildToLeave.leave().queue()));
-                                } else {
-                                    guildToLeave.leave().queue(success ->
-                                            ConfigurationMenus.getFromMessageId(event.getMessageId()).ifPresent(menu -> menu.refreshId().edit(event)));
-                                }
+                            if (guildToLeave == null || selectedGuildId.equals(server.getValue())) {
+                                continue;
+                            }
+
+                            if (guild.getId().equals(server.getValue())) {
+                                ConfigurationMenus.getFromMessageId(event.getMessageId()).ifPresent(menu -> menu.deleteFromHook(success -> guildToLeave.leave().queue()));
+                            } else {
+                                guildToLeave.leave().queue();
                             }
                         }
                     }

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

@@ -38,4 +38,9 @@ public ConfigurationMenu refreshId() {
         super.setContent(super.bot.getStatus().getMenuId());
         return this;
     }
+
+    @Override
+    protected void forget() {
+        ConfigurationMenus.getMenuSet().remove(this);
+    }
 }

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

@@ -42,7 +42,7 @@ public static Optional<ConfigurationMenu> getFromMessageId(String messageId) {
     }
 
     public static void refreshAll() {
-        ConfigurationMenus.menuSet.removeIf(menu -> menu.hook.isExpired());
+        ConfigurationMenus.menuSet.removeIf(menu -> menu.hook == null || menu.hook.isExpired());
         ConfigurationMenus.menuSet.forEach(menu -> menu.refreshId().editFromHook());
     }
 

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

@@ -71,26 +71,32 @@ public void reply(IReplyCallback interaction) {
 
     public void edit(IMessageEditCallback interaction) {
         this.hook = interaction.getHook();
-        interaction.editMessage(MessageEditData.fromCreateData(this.bot.getMenuFactory().getMenu(this.menuId).build(this.args))).queue();
+        interaction.editMessage(MessageEditData.fromCreateData(this.bot.getMenuFactory().getMenu(this.menuId).build(this.args)))
+                .queue(null, new ErrorHandler().handle(ErrorResponse.UNKNOWN_MESSAGE, e -> this.forget()));
     }
 
     public void editFromHook() {
         if (this.hook == null || this.hook.isExpired()) {
             return;
         }
 
-        this.hook.editOriginal(MessageEditData.fromCreateData(this.bot.getMenuFactory().getMenu(this.menuId).build(this.args))).queue();
+        this.hook.editOriginal(MessageEditData.fromCreateData(this.bot.getMenuFactory().getMenu(this.menuId).build(this.args)))
+                .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, new ErrorHandler().ignore(ErrorResponse.UNKNOWN_MESSAGE));
+        this.hook.deleteOriginal()
+                .queue(success.andThen(e -> this.forget()), new ErrorHandler().handle(ErrorResponse.UNKNOWN_MESSAGE, e -> this.forget()));
         this.hook = null;
     }
 
+    protected void forget() {
+    }
+
     public String getId() {
         return this.menuId;
     }