Add command to verify and restore 'Registered' role for all registered users; enhance user removal logic in team matching

Author: maximilianspitzer

cogs/admin_cog.py

@@ -253,5 +253,84 @@ async def close_signups_command(self, interaction: discord.Interaction):
             logger.error(f"Error in close-signups command: {e}", exc_info=True)
             await interaction.response.send_message("An error occurred while toggling signup status.", ephemeral=True)
 
+    @app_commands.command(name="verify-roles", description="Verify and restore 'Registered' role for all registered users")
+    @app_commands.default_permissions(administrator=True)
+    async def verify_roles_command(self, interaction: discord.Interaction):
+        """Admin command to verify and restore the 'Registered' role for all users who are registered in the database."""
+        await interaction.response.defer(ephemeral=True)
+        
+        try:
+            # Get all registered users from database
+            registered_users = await self.bot.db.get_registered_users()
+            
+            if not registered_users:
+                await interaction.followup.send("No users are currently registered in the database.", ephemeral=True)
+                return
+            
+            # Find the "Registered" role
+            guild = interaction.guild
+            registered_role = discord.utils.get(guild.roles, name="Registered")
+            
+            if not registered_role:
+                await interaction.followup.send("Could not find the 'Registered' role in this server.", ephemeral=True)
+                return
+            
+            # Track statistics
+            total_users = len(registered_users)
+            users_fixed = 0
+            users_already_correct = 0
+            users_not_found = 0
+            errors = 0
+            
+            # Process each registered user
+            for user in registered_users:
+                try:
+                    # Skip banned users
+                    if user.get('banned', False):
+                        continue
+                        
+                    user_id = user['user_id']
+                    member = guild.get_member(user_id)
+                    
+                    if member is None:
+                        users_not_found += 1
+                        logger.warning(f"User {user.get('username', user_id)} not found in guild")
+                        continue
+                    
+                    if registered_role not in member.roles:
+                        try:
+                            await member.add_roles(registered_role)
+                            users_fixed += 1
+                            logger.info(f"Added 'Registered' role to {member.name} ({user_id})")
+                        except discord.Forbidden:
+                            errors += 1
+                            logger.error(f"Bot doesn't have permission to add roles to {member.name} ({user_id})")
+                        except Exception as e:
+                            errors += 1
+                            logger.error(f"Error adding role to {member.name} ({user_id}): {e}")
+                    else:
+                        users_already_correct += 1
+                        
+                except Exception as e:
+                    errors += 1
+                    logger.error(f"Error processing user {user.get('username', user['user_id'])}: {e}")
+            
+            # Send summary
+            summary = [
+                f"Processed {total_users} registered users:",
+                f"• {users_fixed} users had their 'Registered' role restored",
+                f"• {users_already_correct} users already had correct roles",
+                f"• {users_not_found} users were not found in the server",
+            ]
+            
+            if errors > 0:
+                summary.append(f"• {errors} errors occurred (check logs)")
+                
+            await interaction.followup.send("\n".join(summary), ephemeral=True)
+            
+        except Exception as e:
+            logger.error(f"Error in verify-roles command: {e}", exc_info=True)
+            await interaction.followup.send(f"An error occurred: {str(e)}", ephemeral=True)
+
 async def setup(bot):
     await bot.add_cog(AdminCog(bot))

cogs/teams_cog.py

@@ -318,37 +318,56 @@ async def remove_unmatched_command(self, interaction: discord.Interaction, categ
                  participants, db_users
             )
 
+            # Track all matched Discord IDs to avoid removing matched users
+            matched_discord_ids = set()
+            
+            # Add exact matches
+            for match in exact_matches:
+                matched_discord_ids.add(match["discord_id"])
+            
+            # Add name-only matches - these are also valid matches
+            for match in name_only_matches:
+                matched_discord_ids.add(match["discord_id"])
+
             users_to_remove = []
             description = ""
 
             # Build list of users to remove based on category
             if category == "all":
-                # All unmatched = unmatched DB users + ambiguous matches
-                users_to_remove.extend([u["discord_id"] for u in unmatched_db_users])
-                for match in ambiguous_matches:
-                    for potential in match["potential_matches"]:
-                        users_to_remove.append(potential["discord_id"])
-                description = "Removing all unmatched users and ambiguous matches"
+                # Only include users that aren't in exact or name-only matches
+                for user in db_users:
+                    if user["user_id"] not in matched_discord_ids:
+                        users_to_remove.append(user["user_id"])
+                description = "Removing all unmatched users"
             elif category == "unmatched_db":
-                users_to_remove.extend([u["discord_id"] for u in unmatched_db_users])
+                # Only include users that aren't in exact or name-only matches
+                for user in unmatched_db_users:
+                    if user["discord_id"] not in matched_discord_ids:
+                        users_to_remove.append(user["discord_id"])
                 description = "Removing unmatched database users"
             elif category == "unmatched_participants":
-                # These are in unmatched_participants but we need to find their discord IDs from db
-                participant_names = {p["name"].lower() for p in unmatched_participants}
+                # Get the Discord IDs of users who are registered with usernames that match unmatched participants
+                participant_names = {p["name"].lower().split('#')[0] for p in unmatched_participants}
                 for user in db_users:
-                    if user.get("matcherino_username", "").lower() in participant_names:
+                    user_matcherino = user.get("matcherino_username", "").lower().split('#')[0]
+                    if user_matcherino in participant_names and user["user_id"] not in matched_discord_ids:
                         users_to_remove.append(user["user_id"])
                 description = "Removing unmatched Matcherino participants"
             elif category == "ambiguous":
+                # Only include ambiguous matches if they're not exact or name-only matches
                 for match in ambiguous_matches:
                     for potential in match["potential_matches"]:
-                        users_to_remove.append(potential["discord_id"])
+                        if potential["discord_id"] not in matched_discord_ids:
+                            users_to_remove.append(potential["discord_id"])
                 description = "Removing users with ambiguous matches"
 
             if not users_to_remove:
                 await interaction.followup.send("No users found to remove for the selected category.", ephemeral=True)
                 return
 
+            # Log what we're about to do
+            logger.info(f"{description}. Found {len(users_to_remove)} users to remove.")
+
             # Remove users from database and update roles
             removed_count = 0
             guild = interaction.guild
@@ -361,7 +380,7 @@ async def remove_unmatched_command(self, interaction: discord.Interaction, categ
                     member = await guild.fetch_member(user_id)
                     if member:
                         roles_to_remove = [role for role in member.roles 
-                                         if role.name.lower() in ["registered"]]
+                                         if role.name.lower() in ["registered", "team member"]]
                         if roles_to_remove:
                             await member.remove_roles(*roles_to_remove)
                     removed_count += 1