Fixed missed column name change.

Added the /time gametime command.

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "cSpell.words": [
+        "aiofiles",
+        "autofilled",
+        "blurple",
+        "CLANLEADER",
+        "Dakiny",
+        "DISCORDMANAGER",
+        "highcouncil"
+    ]
+}

Dockerfile

@@ -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

classes/election.py

@@ -31,9 +31,9 @@ from utils import (
 REQUIRED_VOTES_TO_BE_ELECTED = 3
 
 
-class ElectionCycle:
+class Election:
     """
-    ElectionCycle class.
+    Election class.
 
     This class represents all the dates required for an election cycle along with all the functions needed to operate
     the cycle.
@@ -183,7 +183,7 @@ class ElectionCycle:
         # create new entry into database.
         with Session(engine) as session:
             new_cycle = ElectionInformation(
-                ElectionCycle=quarter_name,
+                ElectionName=quarter_name,
                 ThreadId=thread.id,
                 CouncilNominationMsgId=nominate_msg.id,
             )
@@ -206,9 +206,7 @@ class ElectionCycle:
         )
 
         with Session(engine) as session:
-            stmt = select(ElectionInformation).where(
-                ElectionInformation.ElectionCycle == get_election_name(self.config)
-            )
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == get_election_name(self.config))
             info = session.scalar(stmt)
             info.CouncilVoteMsgId = vote_msg.id
             session.commit()
@@ -231,7 +229,7 @@ class ElectionCycle:
 
         with Session(engine) as session:
             # remove vote button from vote message
-            stmt = select(ElectionInformation).where(ElectionInformation.ElectionCycle == election_name)
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == election_name)
             info = session.scalar(stmt)
             vote_msg: nextcord.Message = await election_thread.fetch_message(info.CouncilVoteMsgId)
             await vote_msg.edit(view=None)
@@ -243,7 +241,7 @@ class ElectionCycle:
             # add the highcouncil role to everyone with 3 or more votes. set elected to true in database
             stmt = (
                 select(Votes.VotedForId)
-                .where(Votes.ElectionCycle == election_name)
+                .where(Votes.ElectionName == election_name)
                 .where(Votes.Type == VoteType.COUNCIL)
             )
             vote_count = collections.Counter(session.scalars(stmt))
@@ -252,7 +250,7 @@ class ElectionCycle:
                 if votes >= REQUIRED_VOTES_TO_BE_ELECTED:
                     stmt = (
                         select(CouncilMembers)
-                        .where(CouncilMembers.ElectionCycle == election_name)
+                        .where(CouncilMembers.ElectionName == election_name)
                         .where(CouncilMembers.MemberId == user_id)
                     )
                     council_member = session.scalar(stmt)
@@ -277,9 +275,7 @@ class ElectionCycle:
         )
 
         with Session(engine) as session:
-            stmt = select(ElectionInformation).where(
-                ElectionInformation.ElectionCycle == get_election_name(self.config)
-            )
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == get_election_name(self.config))
             info = session.scalar(stmt)
             info.HighCouncilVoteMsgId = vote_msg.id
             session.commit()
@@ -295,13 +291,13 @@ class ElectionCycle:
         elect_role: nextcord.Role = self.guild.get_role(self.config.params.clan_council_elect_role_id)
         council_role: nextcord.Role = self.guild.get_role(self.config.params.clan_council_role_id)
 
-        election_cycle = get_election_name(self.config)
+        election_name = get_election_name(self.config)
 
         with Session(engine) as session:
             # role management
             stmt = (
                 select(CouncilMembers.MemberId)
-                .where(CouncilMembers.ElectionCycle == election_cycle)
+                .where(CouncilMembers.ElectionName == election_name)
                 .where(CouncilMembers.Elected == true())
             )
 
@@ -320,13 +316,13 @@ class ElectionCycle:
             # ties are undefined behavior.
             stmt = (
                 select(Votes.VotedForId)
-                .where(Votes.ElectionCycle == election_cycle)
+                .where(Votes.ElectionName == election_name)
                 .where(Votes.Type == VoteType.DISCORDMANAGER)
             )
             dm_votes = collections.Counter(session.scalars(stmt))
             stmt = (
                 select(Votes.VotedForId)
-                .where(Votes.ElectionCycle == election_cycle)
+                .where(Votes.ElectionName == election_name)
                 .where(Votes.Type == VoteType.CLANLEADER)
             )
             cl_votes = collections.Counter(session.scalars(stmt))
@@ -335,7 +331,7 @@ class ElectionCycle:
                 dm_winner = max(dm_votes, key=dm_votes.get)
                 stmt = (
                     update(CouncilMembers)
-                    .where(CouncilMembers.ElectionCycle == election_cycle)
+                    .where(CouncilMembers.ElectionName == election_name)
                     .where(CouncilMembers.MemberId == dm_winner)
                     .values(DiscordManager=True)
                 )
@@ -346,7 +342,7 @@ class ElectionCycle:
                 cl_winner = max(cl_votes, key=cl_votes.get)
                 stmt = (
                     update(CouncilMembers)
-                    .where(CouncilMembers.ElectionCycle == election_cycle)
+                    .where(CouncilMembers.ElectionName == election_name)
                     .where(CouncilMembers.MemberId == cl_winner)
                     .values(ClanLeader=True)
                 )
@@ -360,7 +356,7 @@ class ElectionCycle:
 
         # clear view from vote message
         stmt = select(ElectionInformation.HighCouncilVoteMsgId).where(
-            ElectionInformation.ElectionCycle == get_election_name(self.config)
+            ElectionInformation.ElectionName == get_election_name(self.config)
         )
         vote_msg_id = session.scalar(stmt)
         vote_msg: nextcord.Message = await election_thread.fetch_message(vote_msg_id)
@@ -383,9 +379,7 @@ class ElectionCycle:
             ElectionInformation: The information from the database about the current election.
         """
         with Session(engine) as session:
-            stmt = select(ElectionInformation).where(
-                ElectionInformation.ElectionCycle == get_election_name(self.config)
-            )
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == get_election_name(self.config))
             return session.scalar(stmt)
 
     async def election_reminder(self) -> None:

classes/nominate_highcouncil_views.py

@@ -58,10 +58,10 @@ class NominateDMModal(nextcord.ui.Modal):
 
         with Session(engine) as session:
             # user already in table
-            cycle = get_election_name(self.config)
+            election_name = get_election_name(self.config)
             stmt = (
                 select(CouncilMembers)
-                .where(CouncilMembers.ElectionCycle == cycle)
+                .where(CouncilMembers.ElectionName == election_name)
                 .where(CouncilMembers.MemberId == self.usr_id)
             )
             council_elect = session.scalar(stmt)
@@ -120,10 +120,10 @@ class NominateCLModal(nextcord.ui.Modal):
 
         with Session(engine) as session:
             # user already in table
-            cycle = get_election_name(self.config)
+            election_name = get_election_name(self.config)
             stmt = (
                 select(CouncilMembers)
-                .where(CouncilMembers.ElectionCycle == cycle)
+                .where(CouncilMembers.ElectionName == election_name)
                 .where(CouncilMembers.MemberId == self.usr_id)
             )
             council_elect = session.scalar(stmt)
@@ -170,13 +170,13 @@ class NominateHighCouncilView(nextcord.ui.View):
             )
             return
 
-        cycle = get_election_name(self.config)
+        election_name = get_election_name(self.config)
         usr_nominated = False
         speech_content = ""
         with Session(engine) as session:
             stmt = (
                 select(CouncilMembers)
-                .where(CouncilMembers.ElectionCycle == cycle)
+                .where(CouncilMembers.ElectionName == election_name)
                 .where(CouncilMembers.MemberId == interaction.user.id)
             )
             obj = session.scalar(stmt)
@@ -215,13 +215,13 @@ class NominateHighCouncilView(nextcord.ui.View):
             )
             return
 
-        cycle = get_election_name(self.config)
+        election_name = get_election_name(self.config)
         usr_nominated = False
         speech_content = ""
         with Session(engine) as session:
             stmt = (
                 select(CouncilMembers)
-                .where(CouncilMembers.ElectionCycle == cycle)
+                .where(CouncilMembers.ElectionName == election_name)
                 .where(CouncilMembers.MemberId == interaction.user.id)
             )
             obj = session.scalar(stmt)

classes/nominate_views.py

@@ -50,13 +50,14 @@ class NominateModal(nextcord.ui.Modal):
 
         """
         speech = decorate_nomination(interaction.user.id, self.speech.value)
+        election_name = get_election_name(self.config)
 
         with Session(engine) as session:
             if not self.usr_nominated:
                 msg = await interaction.channel.send(speech)
 
                 council_member = CouncilMembers(
-                    ElectionCycle=get_election_name(self.config),
+                    ElectionName=election_name,
                     MemberId=interaction.user.id,
                     SpeechMsgId=msg.id,
                 )
@@ -64,10 +65,9 @@ class NominateModal(nextcord.ui.Modal):
                 session.commit()
             else:
                 # user already nominated, just need to update the election speech
-                cycle = get_election_name(self.config)
                 stmt = (
                     select(CouncilMembers)
-                    .where(CouncilMembers.ElectionCycle == cycle)
+                    .where(CouncilMembers.ElectionName == election_name)
                     .where(CouncilMembers.MemberId == self.usr_id)
                 )
                 obj = session.scalar(stmt)
@@ -91,7 +91,7 @@ class NominateView(nextcord.ui.View):
     )
     async def nominate(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None:  # noqa: ARG002
         """
-        Button to nominate onself for Clan Council.
+        Button to nominate oneself for Clan Council.
 
         Gathers previous information about the user if they have already nominated themselves, then launches
         the nomination modal to get their speech.
@@ -108,13 +108,13 @@ class NominateView(nextcord.ui.View):
             )
             return
 
-        cycle = get_election_name(self.config)
+        election_name = get_election_name(self.config)
         usr_nominated = False
         speech_content = ""
         with Session(engine) as session:
             stmt = (
                 select(CouncilMembers)
-                .where(CouncilMembers.ElectionCycle == cycle)
+                .where(CouncilMembers.ElectionName == election_name)
                 .where(CouncilMembers.MemberId == interaction.user.id)
             )
             obj = session.scalar(stmt)

classes/voting_highcouncil_views.py

@@ -41,14 +41,14 @@ class VoteSelect(nextcord.ui.StringSelect):
         election_name: str = get_election_name(self.config)
         with Session(engine) as session:
             stmt = select(ElectionInformation.HighCouncilVoteMsgId).where(
-                ElectionInformation.ElectionCycle == election_name
+                ElectionInformation.ElectionName == election_name
             )
             vote_msg_id = session.scalar(stmt)
 
             voted_for = None if self.values[0] == "Abstain" else int(self.values[0])
 
             new_vote = Votes(
-                ElectionCycle=election_name,
+                ElectionName=election_name,
                 VoterId=interaction.user.id,
                 VotedForId=voted_for,
                 Type=self.election_type,
@@ -63,7 +63,7 @@ class VoteSelect(nextcord.ui.StringSelect):
                 session.rollback()
                 stmt = (
                     update(Votes)
-                    .where(Votes.ElectionCycle == election_name)
+                    .where(Votes.ElectionName == election_name)
                     .where(Votes.VoterId == interaction.user.id)
                     .where(Votes.Type == self.election_type)
                     .values(VotedForId=voted_for)
@@ -118,7 +118,7 @@ class VoteHighcouncilView(nextcord.ui.View):
         with Session(engine) as session:
             stmt = (
                 select(Votes.VotedForId)
-                .where(Votes.ElectionCycle == election_name)
+                .where(Votes.ElectionName == election_name)
                 .where(Votes.VoterId == interaction.user.id)
                 .where(Votes.Type == VoteType.CLANLEADER)
             )
@@ -126,7 +126,7 @@ class VoteHighcouncilView(nextcord.ui.View):
 
             stmt = (
                 select(CouncilMembers.MemberId)
-                .where(CouncilMembers.ElectionCycle == election_name)
+                .where(CouncilMembers.ElectionName == election_name)
                 .filter(CouncilMembers.ClanLeaderSpeechId.is_not(None))
             )
 
@@ -190,7 +190,7 @@ class VoteHighcouncilView(nextcord.ui.View):
         with Session(engine) as session:
             stmt = (
                 select(Votes.VotedForId)
-                .where(Votes.ElectionCycle == election_name)
+                .where(Votes.ElectionName == election_name)
                 .where(Votes.VoterId == interaction.user.id)
                 .where(Votes.Type == VoteType.DISCORDMANAGER)
             )
@@ -198,7 +198,7 @@ class VoteHighcouncilView(nextcord.ui.View):
 
             stmt = (
                 select(CouncilMembers.MemberId)
-                .where(CouncilMembers.ElectionCycle == election_name)
+                .where(CouncilMembers.ElectionName == election_name)
                 .filter(CouncilMembers.DiscordManagerSpeechId.is_not(None))
             )
 

classes/voting_views.py

@@ -39,15 +39,13 @@ class VoteSelect(nextcord.ui.StringSelect):
         """
         election_name = get_election_name(self.config)
         with Session(engine) as session:
-            stmt = select(ElectionInformation.CouncilVoteMsgId).where(
-                ElectionInformation.ElectionCycle == election_name
-            )
+            stmt = select(ElectionInformation.CouncilVoteMsgId).where(ElectionInformation.ElectionName == election_name)
             vote_msg_id = session.scalar(stmt)
 
             voted_for = None if self.values[0] == "Abstain" else int(self.values[0])
 
             new_vote = Votes(
-                ElectionCycle=election_name,
+                ElectionName=election_name,
                 VoterId=interaction.user.id,
                 VotedForId=voted_for,
                 Type=VoteType.COUNCIL,
@@ -61,7 +59,7 @@ class VoteSelect(nextcord.ui.StringSelect):
                 session.rollback()
                 stmt = (
                     update(Votes)
-                    .where(Votes.ElectionCycle == election_name)
+                    .where(Votes.ElectionName == election_name)
                     .where(Votes.VoterId == interaction.user.id)
                     .where(Votes.Type == VoteType.COUNCIL)
                     .values(VotedForId=voted_for)
@@ -106,18 +104,18 @@ class VoteView(nextcord.ui.View):
             )
             return
 
-        election: str = get_election_name(self.config)
+        election_name: str = get_election_name(self.config)
 
         with Session(engine) as session:
             stmt = (
                 select(Votes.VotedForId)
-                .where(Votes.ElectionCycle == election)
+                .where(Votes.ElectionName == election_name)
                 .where(Votes.VoterId == interaction.user.id)
                 .where(Votes.Type == VoteType.COUNCIL)
             )
             voted_for = session.scalar(stmt)
 
-            stmt = select(CouncilMembers.MemberId).where(CouncilMembers.ElectionCycle == election)
+            stmt = select(CouncilMembers.MemberId).where(CouncilMembers.ElectionName == election_name)
 
             options = [
                 SelectOption(

cogs/commands/__init__.py

@@ -8,6 +8,7 @@ from cogs.commands.remove import RemoveCog
 from cogs.commands.request import RequestCog
 from cogs.commands.set import SetCog
 from cogs.commands.test import TestCog
+from cogs.commands.time import TimeCog
 from cogs.commands.view import ViewCog
 
 
@@ -19,6 +20,7 @@ def setup(bot: commands.Bot) -> None:
     bot.add_cog(RefreshCog(bot))
     bot.add_cog(RemoveCog())
     bot.add_cog(RequestCog(bot))
-    bot.add_cog(TestCog(bot))
-    bot.add_cog(ViewCog())
     bot.add_cog(SetCog())
+    bot.add_cog(TestCog(bot))
+    bot.add_cog(TimeCog())
+    bot.add_cog(ViewCog())

cogs/commands/record.py

@@ -5,7 +5,7 @@ from discord import TextInputStyle
 from nextcord.ext import commands
 
 from config import DakinyConfig
-from utils import record_event_points
+from utils import GUILDS, MAX_DISCORD_MESSAGE_LENGTH, record_event_points
 
 
 class RecordCog(commands.Cog, name="Record Commands"):
@@ -16,7 +16,7 @@ class RecordCog(commands.Cog, name="Record Commands"):
         super().__init__()
         self.bot: commands.Bot = bot
 
-    @nextcord.slash_command()
+    @nextcord.slash_command(guild_ids=GUILDS)
     async def record(self, interaction: nextcord.Interaction) -> None:
         """Parent slash command for record. Never called."""
 
@@ -64,6 +64,88 @@ class RecordCog(commands.Cog, name="Record Commands"):
             embed=embed,
         )
 
+    @record.subcommand(description="Record a miscellaneous point for a clan member.")
+    async def point(
+        self,
+        interaction: nextcord.Interaction,
+        activity: str = nextcord.SlashOption(
+            description="The type of activity to receive points for.",
+            required=True,
+            choices=[
+                "Clan chat activity",
+                "Teaching or sharing in-game tips",
+                "Recruiting efforts",
+                "Successful recruitment",
+            ],
+        ),
+        justification: str = nextcord.SlashOption(
+            required=True,
+            description="Reason to give the recipient a point.",
+            max_length=int(MAX_DISCORD_MESSAGE_LENGTH / 2),
+        ),
+        recipient: nextcord.Member = nextcord.SlashOption(
+            required=False,
+            description="Discord user to give point to.",
+        ),
+        non_discord_recipient: str = nextcord.SlashOption(
+            required=False, description="Non Discord user to give point to.", max_length=32
+        ),
+    ) -> None:
+        """
+        Gives a point to the provided recipient. Sends recording message to event participation channel.
+
+        Only one recipient should be given point/provided to the command. Fails if not exactly one recipient
+        is given.
+
+        Args:
+            interaction (nextcord.Interaction): interaction with this command.
+            activity (str): Choice list of activities to give point for.
+            justification (str): Reason to give point.
+            recipient (nextcord.Member): Discord member to give point to.
+            non_discord_recipient (str): Non Discord member to give point to.
+        """
+        # role check
+        if interaction.guild.get_role(self.bot.config.params.clan_member_role_id) not in interaction.user.roles:
+            await interaction.response.send_message(
+                f"You must have the <@&{self.bot.config.params.clan_member_role_id}> role to record points.",
+                ephemeral=True,
+            )
+            return
+
+        # pylint or whatever seems to think that there are lines of unreachable code. That is false.
+        if recipient and non_discord_recipient:
+            await interaction.response.send_message("Please only provide 1 recipient.", ephemeral=True)
+            return
+        elif recipient is not None:  # noqa: RET505
+            record_event_points(
+                self.bot.config,
+                [str(recipient.id)],
+                self.bot.config.params.event_participate_points,
+                is_member=True,
+            )
+            recipient_str = f"<@{recipient.id}>"
+        elif non_discord_recipient is not None:
+            record_event_points(
+                self.bot.config,
+                [non_discord_recipient],
+                self.bot.config.params.event_participate_points,
+                is_member=False,
+            )
+            recipient_str = f'"{non_discord_recipient}"'
+        else:
+            await interaction.response.send_message("You must provide a recipient.", ephemeral=True)
+            return
+
+        event_channel: nextcord.TextChannel = interaction.guild.get_channel(
+            self.bot.config.params.event_post_channel_id
+        )
+
+        msg = f"<@{interaction.user.id}> has given {recipient_str} points for the {activity} activity. Justification: {justification}"  # noqa: E501
+        if not msg.endswith("."):
+            msg += "."
+        await event_channel.send(msg)
+        await interaction.response.send_message("Point has been added.", ephemeral=True)
+
 
 class EventView(nextcord.ui.View):
     """
@@ -109,8 +191,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

cogs/commands/test.py

@@ -5,15 +5,14 @@ from typing import TYPE_CHECKING
 import nextcord
 from nextcord.ext import application_checks, commands
 
-from classes.election_cycle import ElectionCycle
-from utils import get_current_election_cycle
+from classes.election import Election
+from utils import GUILDS, get_current_election_cycle
 
 if TYPE_CHECKING:
     from config import DakinyConfig
 
 
 ME = 206602713511886849
-GUILDS = [1000247361639030804]
 
 
 def is_me():  # noqa: ANN201
@@ -46,7 +45,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),
@@ -64,7 +63,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),
@@ -82,7 +81,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),
@@ -100,7 +99,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),
@@ -118,7 +117,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),
@@ -136,7 +135,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),
@@ -154,7 +153,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         config: DakinyConfig = self.bot.config
-        cycle = ElectionCycle(
+        cycle = Election(
             get_current_election_cycle(config),
             config,
             self.bot.get_guild(config.params.guild_id),

cogs/commands/time.py

@@ -0,0 +1,109 @@
+"""Contains commands for time commands."""
+
+from datetime import MAXYEAR, MINYEAR, UTC, datetime
+
+import nextcord
+from nextcord.ext import commands
+
+from utils import GUILDS
+
+
+class TimeCog(commands.Cog, name="Time Commands"):
+    """Class holds time commands."""
+
+    @nextcord.slash_command(guild_ids=GUILDS)
+    async def time(self, interaction: nextcord.Interaction) -> None:
+        """Parent slash command. Never called."""
+
+    @time.subcommand(
+        description="Get a discord timestamp of the given game time. If date information is left blank, uses current day."  # noqa: E501
+    )
+    async def at(  # noqa: PLR0913
+        self,
+        interaction: nextcord.Interaction,
+        hour: int = nextcord.SlashOption(
+            description="The hour you want a timestamp of. Given in gametime/UTC.",
+            min_value=0,
+            max_value=23,
+            required=True,
+        ),
+        minute: int = nextcord.SlashOption(
+            description="The minute you want a timestamp of. Given in gametime/UTC.",
+            min_value=0,
+            max_value=59,
+            required=True,
+        ),
+        year: int = nextcord.SlashOption(
+            description="Year to make timestamp of.", required=False, min_value=MINYEAR, max_value=MAXYEAR
+        ),
+        month: int = nextcord.SlashOption(
+            description="Month to make timestamp of.", required=False, min_value=1, max_value=12
+        ),
+        day: int = nextcord.SlashOption(
+            description="Day to make timestamp of.", required=False, min_value=1, max_value=31
+        ),
+        ephemeral: bool = nextcord.SlashOption(  # noqa: FBT001
+            description="Whether the replying message will be public or not.", required=False, default=True
+        ),
+    ) -> None:
+        """
+        Replies with a discord timestamp of given UTC time.
+
+        Args:
+            interaction (nextcord.Interaction): Interaction with the command.
+            hour (int): The hour in UTC to make the timestamp of..
+            minute (int): The minute in UTC to make the timestamp of..
+            year (int): The year to make the timestamp of.
+            month (int): The month to make the timestamp of.
+            day (int): The day to make the timestamp of.
+            ephemeral (bool): Whether the response is ephemeral or not.
+        """
+        gametime_today: datetime = datetime.now(tz=UTC).replace(hour=hour, minute=minute)
+
+        if year is not None:
+            gametime_today = gametime_today.replace(year=year)
+
+        if month is not None and day is not None:
+            try:
+                gametime_today = gametime_today.replace(month=month, day=day)
+            except ValueError:
+                await interaction.response.send_message(f"Day {day} is out of range for month {month}.", ephemeral=True)
+                return
+        else:
+            if month is not None:
+                try:
+                    gametime_today = gametime_today.replace(month=month)
+                except ValueError:
+                    await interaction.response.send_message(
+                        f"Today ({gametime_today.day}) is out of range for month {month}.", ephemeral=True
+                    )
+                    return
+
+            if day is not None:
+                try:
+                    gametime_today = gametime_today.replace(day=day)
+                except ValueError:
+                    await interaction.response.send_message(
+                        f"Day {day} is out of range for this month {gametime_today.month}.", ephemeral=True
+                    )
+                    return
+
+        await interaction.response.send_message(content=f"<t:{int(gametime_today.timestamp())}:t>", ephemeral=ephemeral)
+
+    @time.subcommand(description="Get the current time in game.")
+    async def gametime(
+        self,
+        interaction: nextcord.Interaction,
+        ephemeral: bool = nextcord.SlashOption(  # noqa: FBT001
+            description="Whether the replying message will be public or not.", required=False, default=True
+        ),
+    ) -> None:
+        """
+        Replies with the current time in game.
+
+        Args:
+            interaction (nextcord.Interaction): Interaction with the command.
+            ephemeral: (bool): Whether the response is ephemeral or not.
+        """
+        gametime = datetime.now(tz=UTC)
+        await interaction.response.send_message(content=f"{gametime.hour}:{gametime.minute}", ephemeral=ephemeral)

cogs/commands/view.py

@@ -7,7 +7,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from database_setup.sql_data_classes import (
-    ParticipationPoints,
+    EventPoints,
     Presences,
     Votes,
     engine,
@@ -49,14 +49,12 @@ class ViewCog(commands.Cog, name="View Commands"):
         with Session(engine) as session:
             if quarter_name:
                 ppdf = pd.read_sql_query(
-                    sql=session.query(ParticipationPoints)
-                    .where(ParticipationPoints.Cycle.startswith(quarter_name))
-                    .statement,
+                    sql=session.query(EventPoints).where(EventPoints.QuarterName.startswith(quarter_name)).statement,
                     con=engine,
                 )
             else:
                 ppdf = pd.read_sql_query(
-                    sql=session.query(ParticipationPoints).statement,
+                    sql=session.query(EventPoints).statement,
                     con=engine,
                 )
 
@@ -64,20 +62,24 @@ class ViewCog(commands.Cog, name="View Commands"):
                 await interaction.followup.send(f'Quarter "{quarter_name}" is invalid.', ephemeral=True)
                 return
 
-            cycles = ppdf.groupby("Cycle")
+            quarters = ppdf.groupby("QuarterName")
             content = ""
-            for cycle in cycles.groups:
-                content += f"**{cycle}**\n"
-                unsorted_all = cycles.get_group(cycle).groupby("DiscordMember")
+            for quarter in quarters.groups:
+                content += f"**{quarter}**\n"
+                unsorted_all = quarters.get_group(quarter).groupby("DiscordMember")
                 members = unsorted_all.get_group(name=True)
-                non_members = unsorted_all.get_group(name=False)
+
+                # there can be no non-discord members sometimes.
+                try:
+                    sorted_non_members = unsorted_all.get_group(name=False).sort_values(by="UserId")
+                except KeyError:
+                    sorted_non_members = None
                 sorted_members = members.sort_values(
                     by="UserId",
                     key=lambda 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")
                 sorted_all = pd.concat([sorted_members, sorted_non_members], ignore_index=True, sort=False)
                 for row in sorted_all.itertuples():
                     userid = row.UserId
@@ -147,7 +149,7 @@ class ViewCog(commands.Cog, name="View Commands"):
             election_name (str): Is SlashOption. The name of the election to view votes for.
             election_type(str): Is SlashOption. The type of election to search for. Choice from StrEnum VoteType.
         """
-        stmt = select(Votes).where(Votes.ElectionCycle == election_name).where(Votes.Type == election_type)
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == election_type)
 
         with Session(engine) as session:
             # Check if election exists.
@@ -176,7 +178,7 @@ class ViewCog(commands.Cog, name="View Commands"):
             election_name (str): String to run autocomplete on.
         """
         with Session(engine) as session:
-            stmt = select(Votes.ElectionCycle).distinct()
+            stmt = select(Votes.ElectionName).distinct()
             elections = session.scalars(stmt)
 
             # if empty compare string
@@ -199,7 +201,7 @@ class ViewCog(commands.Cog, name="View Commands"):
             quarter_name (str): String to run autocomplete on.
         """
         with Session(engine) as session:
-            stmt = select(ParticipationPoints.Cycle).distinct()
+            stmt = select(EventPoints.QuarterName).distinct()
             quarters = session.scalars(stmt)
 
             # if empty compare string

cogs/loops/daily_loop.py

@@ -9,7 +9,7 @@ from pytz import timezone
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from classes.election_cycle import ElectionCycle
+from classes.election import Election
 from database_setup.sql_data_classes import UserBirthday, engine
 from main import birthday_list
 from utils import get_current_election_cycle
@@ -43,7 +43,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         election is over to delete the current election object.
         """
         if self.current_election is None:
-            self.current_election = self.get_election_cycle()
+            self.current_election = self.get_election()
 
         if self.current_election is not None:
             await self.current_election.check_date()
@@ -65,16 +65,16 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         await self.bot.wait_until_ready()
 
         # Bot needs to know guilds to get the current cycle.
-        self.current_election = self.get_election_cycle()
+        self.current_election = self.get_election()
 
-    def get_election_cycle(self) -> ElectionCycle:
+    def get_election(self) -> Election:
         """
         Creates an object for the current election cycle if one is active.
 
         An election is considered active between the election start and the term start.
 
         Returns:
-            ElectionCycle: Current election cycle, None if there is no election happening.
+            Election: Current election cycle, None if there is no election happening.
         """
         config: DakinyConfig = self.bot.config
         cycle = get_current_election_cycle(config)
@@ -83,7 +83,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         if cycle is None:
             return None
 
-        return ElectionCycle(cycle, config, self.bot.get_guild(config.params.guild_id))
+        return Election(cycle, config, self.bot.get_guild(config.params.guild_id))
 
     def update_birthdays(self) -> None:
         """Goes through database to collect all birthdays that are today. Adds user's id to birthday list."""
@@ -91,7 +91,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
 
         # kandy's 1% chance
         if random.randint(0, 99) == 0:  # noqa: S311 isn't cryptography related.
-            birthday_list.append(239547993106284544)
+            birthday_list.append(KANDY)
 
         today = datetime.now(tz=UTC).date()
         birthday = f"{today.month}/{today.day}"

config.py

@@ -27,7 +27,7 @@ class Params:
 
 
 @dataclass
-class ElectionCycle:
+class Election:
     """Class defines relevant election dates."""
 
     election_start: str
@@ -45,5 +45,5 @@ class ElectionCycle:
 class DakinyConfig:
     """Class defines all configs required for Dakiny Bot."""
 
-    election_cycles: list[ElectionCycle]
+    election_cycles: list[Election]
     params: Params

database_setup/database.sql

@@ -1,15 +1,15 @@
 CREATE TABLE ElectionInformation(
-    ElectionCycle varchar(30) not null unique,
+    ElectionName varchar(30) not null unique,
     ThreadId bigint unsigned not null,
     CouncilVoteMsgId bigint unsigned,
     HighCouncilVoteMsgId bigint unsigned,
     CouncilNominationMsgId bigint unsigned,
     HighCouncilNominationMsgId bigint unsigned,
-    PRIMARY KEY (ElectionCycle)
+    PRIMARY KEY (ElectionName)
 );
 
 CREATE TABLE CouncilMembers(
-    ElectionCycle varchar(30) not null,
+    ElectionName varchar(30) not null,
     MemberId bigint unsigned not null,
     SpeechMsgId bigint unsigned not null,
     Elected boolean DEFAULT false,
@@ -17,17 +17,17 @@ CREATE TABLE CouncilMembers(
     ClanLeader boolean DEFAULT false,
     DiscordManagerSpeechId bigint unsigned,
     ClanLeaderSpeechId bigint unsigned,
-    FOREIGN KEY (ElectionCycle) REFERENCES ElectionInformation(ElectionCycle),
-    PRIMARY KEY (ElectionCycle, MemberId)
+    FOREIGN KEY (ElectionName) REFERENCES ElectionInformation(ElectionName),
+    PRIMARY KEY (ElectionName, MemberId)
 );
 
 CREATE TABLE Votes(
-    ElectionCycle varchar(30) not null,
+    ElectionName varchar(30) not null,
     VoterId bigint unsigned not null,
     VotedForId bigint unsigned,
     Type varchar(14) not null DEFAULT 'council' check("Type" in ('council', 'discordmanager', 'clanleader')),
-    FOREIGN KEY (ElectionCycle) REFERENCES ElectionInformation(ElectionCycle),
-    PRIMARY KEY (ElectionCycle, VoterId, Type)
+    FOREIGN KEY (ElectionName) REFERENCES ElectionInformation(ElectionName),
+    PRIMARY KEY (ElectionName, VoterId, Type)
 );
 
 CREATE TABLE UserBirthday (
@@ -41,12 +41,12 @@ CREATE TABLE Presences (
     Presence varchar(100) not null
 );
 
-CREATE TABLE ParticipationPoints (
-    Cycle varchar(30) not null,
+CREATE TABLE EventPoints (
+    QuarterName varchar(30) not null,
     UserId varchar(32) not null,
     DiscordMember boolean not null,
     Points int unsigned DEFAULT 0,
-    PRIMARY KEY (Cycle, UserId)
+    PRIMARY KEY (QuarterName, UserId)
 );
 
 CREATE TABLE Messages (

database_setup/sql_data_classes.py

@@ -14,7 +14,7 @@ CouncilMembers = Base.classes.CouncilMembers
 ElectionInformation = Base.classes.ElectionInformation
 EventPointsLimit = Base.classes.EventPointsLimit
 Messages = Base.classes.Messages
-ParticipationPoints = Base.classes.ParticipationPoints
+EventPoints = Base.classes.EventPoints
 Presences = Base.classes.Presences
 UserBirthday = Base.classes.UserBirthday
 Votes = Base.classes.Votes

pyproject.toml

@@ -21,7 +21,7 @@ setuptools = "^70.0.0"
 
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.4.5"
+ruff = "^0.6.3"
 
 [build-system]
 requires = ["poetry-core"]

utils.py

@@ -15,9 +15,9 @@ from sqlalchemy.orm import Session
 from config import DakinyConfig
 from database_setup.sql_data_classes import (
     CouncilMembers,
+    EventPoints,
     EventPointsLimit,
     Messages,
-    ParticipationPoints,
     Votes,
     engine,
 )
@@ -27,6 +27,7 @@ REPO_DIR = "./dakiny-messages"
 MESSAGES_DIR = f"{REPO_DIR}/messages"
 TEMPLATES_DIR = f"{REPO_DIR}/message_templates"
 MAX_DISCORD_MESSAGE_LENGTH = 2000
+GUILDS = [1000247361639030804, 239758371358638080]
 
 VoteType = StrEnum("VoteType", ["COUNCIL", "DISCORDMANAGER", "CLANLEADER"])
 
@@ -136,7 +137,7 @@ 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
+        config (DakinyConfig): Dakiny config object
         guild (nextcord.Guild): The guild object. Used to get display names for sorting.
 
     Returns:
@@ -147,7 +148,7 @@ def build_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> str:
     election_name = get_election_name(config)
 
     with Session(engine) as session:
-        stmt = select(CouncilMembers).where(CouncilMembers.ElectionCycle == election_name)
+        stmt = select(CouncilMembers).where(CouncilMembers.ElectionName == election_name)
 
         for nominee in sorted(
             session.scalars(stmt),
@@ -155,7 +156,7 @@ def build_votes_str(config: DakinyConfig, guild: nextcord.Guild) -> str:
         ):
             votes[nominee.MemberId] = 0
 
-        stmt = select(Votes).where(Votes.ElectionCycle == election_name).where(Votes.Type == VoteType.COUNCIL)
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == VoteType.COUNCIL)
 
         for vote in session.scalars(stmt):
             if vote.VotedForId is not None:
@@ -172,7 +173,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) ->
     Creates a string that contains all high council nominees and their votes to be sent as a discord message.
 
     Args:
-        config (DakinyConfig): Daking config object
+        config (DakinyConfig): Dakiny config object
         guild (nextcord.Guild): The guild object. Used to get display names for sorting.
 
     Returns:
@@ -186,7 +187,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) ->
     with Session(engine) as session:
         stmt = (
             select(CouncilMembers)
-            .where(CouncilMembers.ElectionCycle == election_name)
+            .where(CouncilMembers.ElectionName == election_name)
             .filter(CouncilMembers.ClanLeaderSpeechId.is_not(None))
         )
 
@@ -196,7 +197,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) ->
         ):
             cl_votes[nominee.MemberId] = 0
 
-        stmt = select(Votes).where(Votes.ElectionCycle == election_name).where(Votes.Type == VoteType.CLANLEADER)
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == VoteType.CLANLEADER)
 
         for vote in session.scalars(stmt):
             if vote.VotedForId is not None:
@@ -204,7 +205,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) ->
 
         stmt = (
             select(CouncilMembers)
-            .where(CouncilMembers.ElectionCycle == election_name)
+            .where(CouncilMembers.ElectionName == election_name)
             .filter(CouncilMembers.DiscordManagerSpeechId.is_not(None))
         )
 
@@ -214,7 +215,7 @@ def build_highcouncil_votes_str(config: DakinyConfig, guild: nextcord.Guild) ->
         ):
             dm_votes[nominee.MemberId] = 0
 
-        stmt = select(Votes).where(Votes.ElectionCycle == election_name).where(Votes.Type == VoteType.DISCORDMANAGER)
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == VoteType.DISCORDMANAGER)
 
         for vote in session.scalars(stmt):
             if vote.VotedForId is not None:
@@ -317,17 +318,13 @@ def record_event_points(config: DakinyConfig, users: Sequence[str], add_points:
     quarter_name = get_quarter_name(config)
     with Session(engine) as session:
         for user in users:
-            stmt = (
-                select(ParticipationPoints)
-                .where(ParticipationPoints.UserId == user)
-                .where(ParticipationPoints.Cycle == quarter_name)
-            )
+            stmt = select(EventPoints).where(EventPoints.UserId == user).where(EventPoints.QuarterName == quarter_name)
 
             points = session.scalar(stmt)
             if points is None:
                 add_points = get_allowed_points(session, config.params.event_points_weekly_limit, user, add_points)
-                new_points = ParticipationPoints(
-                    Cycle=quarter_name,
+                new_points = EventPoints(
+                    QuarterName=quarter_name,
                     UserId=user,
                     DiscordMember=is_member,
                     Points=add_points,
@@ -370,11 +367,7 @@ def get_allowed_points(session: Session, points_limit: int, user: str, points: i
         add_points = points
         session.add(new_limit)
     else:
-        add_points = (
-            points
-            if limit.Points + points <= points_limit
-            else (points_limit - limit.Points if points_limit - limit.Points > 0 else 0)
-        )
+        add_points = points if limit.Points + points <= points_limit else (max(0, points_limit - limit.Points))
         limit.Points += add_points
 
     session.commit()
@@ -511,7 +504,7 @@ async def edit_clan_message(
 
 async def edit_clan_council_info(guild: nextcord.Guild, config: DakinyConfig) -> None:
     """
-    Gets the winners of the elections and updates the perminant message that states the current council.
+    Gets the winners of the elections and updates the permanent message that states the current council.
 
     Args:
         guild (nextcord.Guild): Guild object that to use to get channel.
@@ -519,23 +512,23 @@ async def edit_clan_council_info(guild: nextcord.Guild, config: DakinyConfig) ->
     """
     clan_info_channel: nextcord.TextChannel = await guild.fetch_channel(config.params.clan_info_channel_id)
 
-    election = get_election_name(config)
+    election_name = get_election_name(config)
     with Session(engine) as session:
         stmt = (
             select(CouncilMembers.MemberId)
-            .where(CouncilMembers.ElectionCycle == election)
+            .where(CouncilMembers.ElectionName == election_name)
             .where(CouncilMembers.DiscordManager == true())
         )
         discord_manager = session.scalar(stmt)
         stmt = (
             select(CouncilMembers.MemberId)
-            .where(CouncilMembers.ElectionCycle == election)
+            .where(CouncilMembers.ElectionName == election_name)
             .where(CouncilMembers.ClanLeader == true())
         )
         clan_leader = session.scalar(stmt)
         stmt = (
             select(CouncilMembers.MemberId)
-            .where(CouncilMembers.ElectionCycle == election)
+            .where(CouncilMembers.ElectionName == election_name)
             .where(CouncilMembers.Elected == true())
         )