Compare commits

...
Author SHA1 Message Date
imcompiling 1c8e8c4d5a Merge branch 'main' into mock-election
build_develop / build (push) Successful in 1m29s
2023-11-07 14:44:40 -05:00
imcompiling 40d220e2bb Merge branch '32-view-votes-command'
build_develop / build (push) Successful in 50s
2023-11-07 14:44:33 -05:00
imcompiling 4e8032823d Fix check if election exists.
build_develop / build (push) Successful in 1m35s
Scalars doesn't return None if the thing doesn't exists while scalar does.
2023-11-07 14:44:07 -05:00
imcompiling 678fcd37e1 Add command to init.
Correctly set autocomplete.
Put newlines where I forgot to.
2023-11-07 14:12:42 -05:00
imcompiling 7530c59a94 Update function header.
build_develop / build (push) Successful in 1m25s
2023-11-06 20:27:36 -05:00
imcompiling 6abab5c4e5 Remove missedd code snippet.
build_develop / build (push) Successful in 1m26s
2023-11-06 20:26:24 -05:00
imcompiling 088de263cc Created initial view votes command.
build_develop / build (push) Successful in 1m26s
2023-11-06 20:20:58 -05:00
imcompiling 0b5423a62b Merge branch 'main' into mock-election
build_develop / build (push) Successful in 1m22s
2023-11-06 19:47:39 -05:00
imcompiling ffc78a8814 Merge branch '33-fixes-from-mock-election'
build_latest / build (push) Successful in 50s
build_release / build (push) Successful in 47s
build_develop / build (push) Successful in 45s
2023-11-06 19:47:22 -05:00
imcompiling 3e88d62577 Edit election announcement first line.
build_develop / build (push) Successful in 1m24s
2023-11-06 19:46:54 -05:00
imcompiling 392044c658 Reduce length of header splitter.
build_develop / build (push) Successful in 1m34s
2023-11-06 19:45:49 -05:00
imcompiling dbbb7c1c62 Change votes to 2 for mock test
build_develop / build (push) Successful in 1m26s
2023-11-04 09:20:19 -04:00
imcompiling 9442a294f3 Merge branch '28-add-election-reminder'
build_latest / build (push) Successful in 44s
build_develop / build (push) Successful in 53s
2023-11-03 17:32:00 -04:00
5 changed files with 104 additions and 7 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
```fix
The Dakiny's admin team election
Dakiny's Clan Council election
```
Dakiny is an organization built by and for its members. We are a community of people who come together to support each other in the creation of this magical and unique experience. To sustain what we've created here, and to grow and involve into the future, we vote in our leadership every 3 months to provide an opportunity for new clan members to represent their faction of Dakiny in the Clan Council.
+1 -1
View File
@@ -224,7 +224,7 @@ class ElectionCycle:
vote_count = collections.Counter(session.scalars(stmt))
for user_id, votes in vote_count.items():
if votes >= 3:
if votes >= 2:
stmt = (
select(CouncilMembers)
.where(CouncilMembers.ElectionCycle == election_name)
+4 -5
View File
@@ -11,7 +11,7 @@ from config import DakinyConfig
from database_setup.sql_data_classes import CouncilMembers, engine
from utils import get_election_cycle_name
NOMINEE_SPLITTER = "========================================================\n\n"
NOMINEE_SPLITTER = "========================================\n\n"
class NominateModal(nextcord.ui.Modal):
@@ -69,7 +69,6 @@ class NominateModal(nextcord.ui.Modal):
.where(CouncilMembers.MemberId == self.usr_id)
)
obj = session.scalar(stmt)
obj.SpeechMsgContents = self.speech.value
msg: nextcord.Message = await interaction.channel.fetch_message(obj.SpeechMsgId)
await msg.edit(content=decorate_nomination(interaction.user.id, self.speech.value))
@@ -115,13 +114,13 @@ class NominateView(nextcord.ui.View):
)
def decorate_nomination(user_id, speech) -> str:
def decorate_nomination(user_id: int, speech: str) -> str:
"""
Decorates a nomination speech so that it sits within multiple speeches better.
Args:
user_id (_type_): ID of user sending the speech
speech (_type_): Speech from the user
user_id (int): ID of user sending the speech
speech (str): Speech from the user
Returns:
str: Decorated speech
+2
View File
@@ -7,6 +7,7 @@ from nextcord.ext import commands
from cogs.commands.request import RequestCog
from cogs.commands.set import setCog
from cogs.commands.test import TestCog
from cogs.commands.view import ViewCog
# This function will be called when this extension is loaded.
@@ -19,3 +20,4 @@ def setup(bot: commands.Bot):
bot.add_cog(RequestCog(bot))
bot.add_cog(TestCog(bot))
bot.add_cog(setCog())
bot.add_cog(ViewCog())
+96
View File
@@ -0,0 +1,96 @@
"""
Commands for viewing information in the database.
"""
import nextcord
from nextcord.ext import commands
from sqlalchemy import select
from sqlalchemy.orm import Session
from database_setup.sql_data_classes import ElectionInformation, Votes, engine
class ViewCog(commands.Cog, name="View Commands"):
"""
Holds the view commands.
"""
def __init__(self) -> None:
"""
Default constructor for ViewCog class. Does nothing.
"""
@nextcord.slash_command()
async def view(self, interaction: nextcord.Interaction):
"""
Parent slash command for set. Never called.
"""
@view.subcommand(
description="Shows all voters and who they voted for in a given election."
)
async def votes(
self,
interaction: nextcord.Interaction,
election_name: str = nextcord.SlashOption(
required=True, description="The election you want to view votes for."
),
):
"""
Takes in an election name and sends a response message to the user with a list of people who voted in that
election and who they voted for. Notes those tho abstained. Tells a user if the election is invalid. Uses
autocompletion to assist with getting elections.
Args:
interaction (nextcord.Interaction): User's interaction with the command.
election_name (str): Is SlashOption. The name of the election to view votes for.
"""
stmt = select(Votes).where(Votes.ElectionCycle == election_name)
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
)
return
votes = session.scalars(stmt)
content = ""
for vote in votes:
content += (
f"<@{vote.VoterId}> voted for <@{vote.VotedForId}>.\n"
if vote.VotedForId is not None
else f"<@{vote.VoterId}> abstained from voted.\n"
)
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
):
"""
Collects all elections that start with the election string.
Args:
interaction (nextcord.Interaction): Interaction with command.
election_name (str): String to run autocomplete on.
"""
with Session(engine) as session:
stmt = select(ElectionInformation.ElectionCycle)
elections = session.scalars(stmt)
# if empty compare string
if not election_name:
await interaction.response.send_autocomplete(elections)
return
autofilled_elections: "list[str]" = [
election
for election in elections
if election.lower().startswith(election_name.lower())
]
await interaction.response.send_autocomplete(autofilled_elections[:25])