Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff85c8d485 | ||
|
|
ca0d27a929 | ||
|
|
8ebb689ee7 | ||
|
|
ecc81c5f35 | ||
|
|
96c1fcb17c | ||
|
|
840e17e03a |
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM python:3.11.9-slim
|
||||
FROM python:3.12.3-slim
|
||||
|
||||
# install dependencies
|
||||
RUN apt-get update && apt-get -y upgrade && apt-get -y install git sqlite3
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -109,8 +109,8 @@ class EventView(nextcord.ui.View):
|
||||
record_event_points(
|
||||
self.config,
|
||||
discord_users_list,
|
||||
True, # noqa: FBT003
|
||||
self.config.params.event_participate_points,
|
||||
is_member=True,
|
||||
)
|
||||
|
||||
non_discord_users = interaction.message.embeds[0].fields[1].value
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user