This commit is contained in:
@@ -4,6 +4,7 @@ File contains util functions.
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
import nextcord
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
@@ -106,12 +107,13 @@ def get_current_cycle(config: DakinyConfig) -> int:
|
||||
return None
|
||||
|
||||
|
||||
def build_votes_str(config: DakinyConfig) -> str:
|
||||
def build_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> str:
|
||||
"""
|
||||
Creates a string that contains all nominees and their votes to be sent as a discord message.
|
||||
|
||||
Args:
|
||||
config (DakinyConfig): Daking config object
|
||||
guild (nextcord.Guild): The guild object. Used to get display names for sorting.
|
||||
|
||||
Returns:
|
||||
str: String that contains all nominees and their votes.
|
||||
@@ -124,7 +126,10 @@ def build_votes_str(config: DakinyConfig) -> str:
|
||||
CouncilMembers.ElectionCycle == get_election_cycle_name(config)
|
||||
)
|
||||
|
||||
for nominee in session.scalars(stmt):
|
||||
for nominee in sorted(
|
||||
session.scalars(stmt),
|
||||
key=lambda nominee: guild.get_member(nominee.MemberId).display_name,
|
||||
):
|
||||
votes[nominee.MemberId] = 0
|
||||
|
||||
stmt = select(Votes).where(
|
||||
@@ -141,7 +146,7 @@ def build_votes_str(config: DakinyConfig) -> str:
|
||||
return votes_str
|
||||
|
||||
|
||||
def build_highcouncil_votes_str(config: DakinyConfig) -> str:
|
||||
def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> str:
|
||||
"""
|
||||
Creates a string that contains all high council nominees and their votes to be sent as a discord message.
|
||||
|
||||
@@ -150,6 +155,7 @@ def build_highcouncil_votes_str(config: DakinyConfig) -> str:
|
||||
|
||||
Returns:
|
||||
str: String that contains all nominees and their votes.
|
||||
guild (nextcord.Guild): The guild object. Used to get display names for sorting.
|
||||
"""
|
||||
|
||||
cl_votes: dict[int, int] = {}
|
||||
@@ -162,7 +168,10 @@ def build_highcouncil_votes_str(config: DakinyConfig) -> str:
|
||||
.filter(CouncilMembers.ClanLeaderSpeechId.is_not(None))
|
||||
)
|
||||
|
||||
for nominee in session.scalars(stmt):
|
||||
for nominee in sorted(
|
||||
session.scalars(stmt),
|
||||
key=lambda nominee: guild.get_member(nominee.MemberId).display_name,
|
||||
):
|
||||
cl_votes[nominee.MemberId] = 0
|
||||
|
||||
stmt = select(Votes).where(Votes.ElectionCycle == get_cl_election_name(config))
|
||||
@@ -177,7 +186,10 @@ def build_highcouncil_votes_str(config: DakinyConfig) -> str:
|
||||
.filter(CouncilMembers.DiscordManagerSpeechId.is_not(None))
|
||||
)
|
||||
|
||||
for nominee in session.scalars(stmt):
|
||||
for nominee in sorted(
|
||||
session.scalars(stmt),
|
||||
key=lambda nominee: guild.get_member(nominee.MemberId).display_name,
|
||||
):
|
||||
dm_votes[nominee.MemberId] = 0
|
||||
|
||||
stmt = select(Votes).where(Votes.ElectionCycle == get_dm_election_name(config))
|
||||
|
||||
Reference in New Issue
Block a user