Users can deselect roles to remove them

Author: JJeeff248

application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java

@@ -190,18 +190,18 @@ public void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<Str
         List<Role> guildRoles = Objects.requireNonNull(event.getGuild()).getRoles();
         List<String> roleIds = guildRoles.stream().map(Role::getId).collect(Collectors.toList());
 
-        List<Role> roles = new ArrayList<>();
+        List<Role> selectedRoles = new ArrayList<>();
         for (SelectOption role : Objects.requireNonNull(event.getSelectedOptions())) {
             if (roleIds.contains(role.getValue())) {
-                roles.add(guildRoles.get(roleIds.indexOf(role.getValue())));
+                selectedRoles.add(guildRoles.get(roleIds.indexOf(role.getValue())));
             }
         }
 
         // True if the event option was 'choose'
         if (event.getMessage().isEphemeral()) {
 
             SelectionMenu.Builder menu = SelectionMenu.create(generateComponentId(member.getId()));
-            menu.setPlaceholder("Select your roles").setMaxValues(roles.size());
+            menu.setPlaceholder("Select your roles").setMaxValues(selectedRoles.size());
 
             for (SelectOption roleOption : Objects.requireNonNull(event.getSelectedOptions())) {
                 Role role = guildRoles.get(roleIds.indexOf(roleOption.getValue()));
@@ -218,14 +218,25 @@ public void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<Str
             return;
         }
 
+        List<SelectOption> menuOptions =
+                Objects.requireNonNull(event.getInteraction().getComponent()).getOptions();
+
+        // Remove deselected roles
+        for (SelectOption option : menuOptions) {
+            Role role = guildRoles.get(roleIds.indexOf(option.getValue()));
+            if (!selectedRoles.contains(role)) {
+                Objects.requireNonNull(event.getGuild()).removeRoleFromMember(member, role).queue();
+            }
+        }
+
         // Add the selected roles to the member
         for (Role role : guildRoles) {
-            if (roles.contains(role)) {
+            if (selectedRoles.contains(role)) {
                 Objects.requireNonNull(event.getGuild()).addRoleToMember(member, role).queue();
             }
         }
 
-        event.reply("Added your roles!").setEphemeral(true).queue();
+        event.reply("Updated your roles!").setEphemeral(true).queue();
     }
 
     /**