Merge branch '63-bad-sorting'

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(

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(

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")

cogs/loops/bot_presence.py

@@ -35,4 +35,4 @@ class BotPresence(commands.Cog, name="Bot Presence"):
         with Session(engine) as session:
             presence = session.scalar(select(Presences.Presence).order_by(func.random()))
 
-        await self.bot.change_presence(activity=nextcord.CustomActivity(name="Custom Status", state=presence))
+        await self.bot.change_presence(activity=nextcord.CustomActivity(presence))

pyproject.toml

@@ -7,16 +7,17 @@ readme = "README.md"
 package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.12"
-gitpython = "3.1.43"
+gitpython = "^3.1.43"
-fastapi = "0.111.0"
+fastapi = "^0.111.0"
-hydra-core = "1.3.2"
+hydra-core = "^1.3.2"
-nextcord = "2.4.2"
+nextcord = "^2.6.0"
-pandas = "1.5.2"
+pandas = "^2.2.2"
-python-dotenv = "1.0.0"
+python-dotenv = "^1.0.1"
-pytz = "2022.7.1"
+pytz = "^2024.1"
-sqlalchemy = "1.4.46"
+sqlalchemy = "^2.0.30"
 aiofiles = "^23.2.1"
+setuptools = "^70.0.0"
 
 
 [tool.poetry.group.dev.dependencies]
@@ -63,7 +64,7 @@ line-length = 120
 indent-width = 4
 
 # Assume Python 3.8
-target-version = "py311"
+target-version = "py312"
 
 [tool.ruff.lint]
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.

runtime.txt

@@ -1 +0,0 @@
-python-3.10.4

utils.py

@@ -1,5 +1,6 @@
 """File contains util functions."""
 
+import calendar
 import os
 from collections.abc import Sequence
 from datetime import UTC, datetime
@@ -46,12 +47,10 @@ def get_datetime(day: str) -> datetime:
     day = int(day.split("/")[1])
 
     # ensure that year rolls over if current month is December and the next month is less than 12.
-    # TODO(imcompiling): replace with Calendar.DECEMBER when updating to python 3.12
+    if today.month == calendar.DECEMBER and month < calendar.DECEMBER:
-    # https://gitea.cheezers.org/imcompiling/dakiny-bot/issues/52
-    if today.month == 12 and month < 12:
         year += 1
 
-    if today.month == 1 and month > 1:
+    if today.month == calendar.JANUARY and month > calendar.JANUARY:
         year -= 1
 
     return datetime(year, month, day, tzinfo=UTC)
@@ -152,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
 
@@ -193,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
 
@@ -211,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
 
@@ -540,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)