From 96c1fcb17c03bcce94529319fe89ae2a953be7c0 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Fri, 24 May 2024 13:58:25 -0400 Subject: [PATCH 1/2] Sort all members by lowercase display name. --- classes/voting_highcouncil_views.py | 4 ++-- classes/voting_views.py | 2 +- cogs/commands/view.py | 2 +- utils.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/voting_highcouncil_views.py b/classes/voting_highcouncil_views.py index f35677c..98d3b1e 100644 --- a/classes/voting_highcouncil_views.py +++ b/classes/voting_highcouncil_views.py @@ -141,7 +141,7 @@ class VoteHighcouncilView(nextcord.ui.View): ) for nominee in sorted( session.scalars(stmt), - key=lambda nominee: self.guild.get_member(nominee).display_name, + key=lambda nominee: self.guild.get_member(nominee).display_name.lower(), ) ] options.append( @@ -213,7 +213,7 @@ class VoteHighcouncilView(nextcord.ui.View): ) for nominee in sorted( session.scalars(stmt), - key=lambda nominee: self.guild.get_member(nominee).display_name, + key=lambda nominee: self.guild.get_member(nominee).display_name.lower(), ) ] options.append( diff --git a/classes/voting_views.py b/classes/voting_views.py index c480d69..09dd647 100644 --- a/classes/voting_views.py +++ b/classes/voting_views.py @@ -130,7 +130,7 @@ class VoteView(nextcord.ui.View): ) for nominee in sorted( session.scalars(stmt), - key=lambda nominee: self.guild.get_member(nominee).display_name, + key=lambda nominee: self.guild.get_member(nominee).display_name.lower(), ) ] options.append( diff --git a/cogs/commands/view.py b/cogs/commands/view.py index 654643c..195ed37 100644 --- a/cogs/commands/view.py +++ b/cogs/commands/view.py @@ -74,7 +74,7 @@ class ViewCog(commands.Cog, name="View Commands"): sorted_members = members.sort_values( by="UserId", key=lambda user_ids: ( - [interaction.guild.get_member(int(user_id)).display_name for user_id in user_ids] + [interaction.guild.get_member(int(user_id)).display_name.lower() for user_id in user_ids] ), ) sorted_non_members = non_members.sort_values(by="UserId") diff --git a/utils.py b/utils.py index 00c0e0f..c8bac80 100644 --- a/utils.py +++ b/utils.py @@ -151,7 +151,7 @@ def build_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> str: for nominee in sorted( session.scalars(stmt), - key=lambda nominee: guild.get_member(nominee.MemberId).display_name, + key=lambda nominee: guild.get_member(nominee.MemberId).display_name.lower(), ): votes[nominee.MemberId] = 0 @@ -192,7 +192,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> for nominee in sorted( session.scalars(stmt), - key=lambda nominee: guild.get_member(nominee.MemberId).display_name, + key=lambda nominee: guild.get_member(nominee.MemberId).display_name.lower(), ): cl_votes[nominee.MemberId] = 0 @@ -210,7 +210,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> for nominee in sorted( session.scalars(stmt), - key=lambda nominee: guild.get_member(nominee.MemberId).display_name, + key=lambda nominee: guild.get_member(nominee.MemberId).display_name.lower(), ): dm_votes[nominee.MemberId] = 0 From ecc81c5f35f0b1b2107edbefb8fffec3e19e2cc1 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Fri, 24 May 2024 14:03:23 -0400 Subject: [PATCH 2/2] Sort the council member info. --- utils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils.py b/utils.py index c8bac80..3501231 100644 --- a/utils.py +++ b/utils.py @@ -539,8 +539,12 @@ async def edit_clan_council_info(guild: nextcord.Guild, config: DakinyConfig) -> .where(CouncilMembers.Elected == true()) ) + council_member_ids = sorted( + session.scalars(stmt), key=lambda user_id: guild.get_member(user_id).display_name.lower() + ) + council_members_strs = [ - f"<@{user_id}>" for user_id in session.scalars(stmt) if user_id not in (discord_manager, clan_leader) + f"<@{user_id}>" for user_id in council_member_ids if user_id not in (discord_manager, clan_leader) ] quarter = get_quarter_name(config)