Turned on all ruff rules. Formatted all files.
This commit is contained in:
+13
-50
@@ -60,9 +60,7 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
)
|
||||
|
||||
if df.empty:
|
||||
await interaction.followup.send(
|
||||
f'Quarter "{quarter_name}" is invalid.', ephemeral=True
|
||||
)
|
||||
await interaction.followup.send(f'Quarter "{quarter_name}" is invalid.', ephemeral=True)
|
||||
return
|
||||
|
||||
cycles = df.groupby("Cycle")
|
||||
@@ -74,32 +72,19 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
non_members = unsorted_all.get_group(False)
|
||||
sorted_members = members.sort_values(
|
||||
by="UserId",
|
||||
key=lambda user_ids: (
|
||||
[
|
||||
interaction.guild.get_member(int(id)).display_name
|
||||
for id in user_ids
|
||||
]
|
||||
),
|
||||
key=lambda user_ids: ([interaction.guild.get_member(int(id)).display_name for id in user_ids]),
|
||||
)
|
||||
sorted_non_members = non_members.sort_values(by="UserId")
|
||||
sorted_all = pd.concat(
|
||||
[sorted_members, sorted_non_members], ignore_index=True, sort=False
|
||||
)
|
||||
sorted_all = pd.concat([sorted_members, sorted_non_members], ignore_index=True, sort=False)
|
||||
for row in sorted_all.itertuples():
|
||||
userid = row.UserId
|
||||
points = row.Points
|
||||
discord_member = row.DiscordMember
|
||||
content += (
|
||||
f"<@{userid}>: {points}\n"
|
||||
if discord_member
|
||||
else f"{userid}: {points}\n"
|
||||
)
|
||||
content += f"<@{userid}>: {points}\n" if discord_member else f"{userid}: {points}\n"
|
||||
content += "\n"
|
||||
|
||||
if len(content) > 2000:
|
||||
await interaction.followup.send(
|
||||
"Message length is too long, please select search to limit results."
|
||||
)
|
||||
await interaction.followup.send("Message length is too long, please select search to limit results.")
|
||||
return
|
||||
|
||||
await interaction.followup.send(content=content, ephemeral=True)
|
||||
@@ -128,21 +113,13 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
presences = session.scalars(stmt)
|
||||
|
||||
if search:
|
||||
message = "\n".join(
|
||||
[
|
||||
presence
|
||||
for presence in presences
|
||||
if search.lower() in presence.lower()
|
||||
]
|
||||
)
|
||||
message = "\n".join([presence for presence in presences if search.lower() in presence.lower()])
|
||||
else:
|
||||
message = "\n".join(list(presences))
|
||||
|
||||
await interaction.followup.send(content=message, ephemeral=True)
|
||||
|
||||
@view.subcommand(
|
||||
description="Shows all voters and who they voted for in a given election."
|
||||
)
|
||||
@view.subcommand(description="Shows all voters and who they voted for in a given election.")
|
||||
async def votes(
|
||||
self,
|
||||
interaction: nextcord.Interaction,
|
||||
@@ -165,18 +142,12 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
election_name (str): Is SlashOption. The name of the election to view votes for.
|
||||
"""
|
||||
|
||||
stmt = (
|
||||
select(Votes)
|
||||
.where(Votes.ElectionCycle == election_name)
|
||||
.where(Votes.Type == election_type)
|
||||
)
|
||||
stmt = select(Votes).where(Votes.ElectionCycle == election_name).where(Votes.Type == election_type)
|
||||
|
||||
with Session(engine) as session:
|
||||
# Check if election exists.
|
||||
if session.scalar(stmt) is None:
|
||||
await interaction.response.send_message(
|
||||
f"Invalid election: {election_name}.", ephemeral=True
|
||||
)
|
||||
await interaction.response.send_message(f"Invalid election: {election_name}.", ephemeral=True)
|
||||
return
|
||||
|
||||
votes = session.scalars(stmt)
|
||||
@@ -191,9 +162,7 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
await interaction.response.send_message(content=content, ephemeral=True)
|
||||
|
||||
@votes.on_autocomplete("election_name")
|
||||
async def election_autocomplete(
|
||||
self, interaction: nextcord.Interaction, election_name: str
|
||||
):
|
||||
async def election_autocomplete(self, interaction: nextcord.Interaction, election_name: str):
|
||||
"""
|
||||
Collects all elections that start with the election string.
|
||||
|
||||
@@ -212,16 +181,12 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
return
|
||||
|
||||
autofilled_elections: "list[str]" = [
|
||||
election
|
||||
for election in elections
|
||||
if election.lower().startswith(election_name.lower())
|
||||
election for election in elections if election.lower().startswith(election_name.lower())
|
||||
]
|
||||
await interaction.response.send_autocomplete(autofilled_elections[:25])
|
||||
|
||||
@event_points.on_autocomplete("quarter_name")
|
||||
async def event_points_autocomplete(
|
||||
self, interaction: nextcord.Interaction, quarter_name: str
|
||||
):
|
||||
async def event_points_autocomplete(self, interaction: nextcord.Interaction, quarter_name: str):
|
||||
"""
|
||||
Collects all elections that start with the election string.
|
||||
|
||||
@@ -240,8 +205,6 @@ class ViewCog(commands.Cog, name="View Commands"):
|
||||
return
|
||||
|
||||
autofilled_quarters: "list[str]" = [
|
||||
quarter
|
||||
for quarter in quarters
|
||||
if quarter.lower().startswith(quarter_name.lower())
|
||||
quarter for quarter in quarters if quarter.lower().startswith(quarter_name.lower())
|
||||
]
|
||||
await interaction.response.send_autocomplete(autofilled_quarters[:25])
|
||||
|
||||
Reference in New Issue
Block a user