Change cutoff months for rollover.

DakinySettings.py

@@ -35,6 +35,16 @@ class Election:
     voting_start: str
 
 
+@dataclass
+class EventSettings:
+    """Class defines settings editable by Clan Council."""
+
+    host_points: int
+    participate_points: int
+    verify: bool
+    weekly_limit: int
+
+
 @dataclass
 class Params:
     """Class defines start parameters that shouldn't be changed."""
@@ -44,19 +54,6 @@ class Params:
     guild_id: int
 
 
-@dataclass
-class PointSettings:
-    """Class defines point settings editable by Clan Council."""
-
-    clan_points: int
-    clan_points_weekly_limit: int
-    events_weekly_limit: int
-    host_points: int
-    participate_points: int
-    verify_clan_points: bool
-    verify_events: bool
-
-
 @dataclass
 class RoleIds:
     """Class holds all role ids needed by bot."""
@@ -74,8 +71,8 @@ class DakinySettings(YAMLWizard):
 
     channel_ids: ChannelIds
     election_cycles: list[Election]
+    event_settings: EventSettings
     params: Params
-    point_settings: PointSettings
     role_ids: RoleIds
 
     def save(self) -> None:

cogs/commands/record.py

@@ -119,14 +119,14 @@ class RecordCog(commands.Cog, name="Record Commands"):
         elif recipient is not None:  # noqa: RET505
             record_event_points(
                 [str(recipient.id)],
-                settings.point_settings.participate_points,
+                settings.event_settings.participate_points,
                 is_member=True,
             )
             recipient_str = f"<@{recipient.id}>"
         elif non_discord_recipient is not None:
             record_event_points(
                 [non_discord_recipient],
-                settings.point_settings.participate_points,
+                settings.event_settings.participate_points,
                 is_member=False,
             )
             recipient_str = f'"{non_discord_recipient}"'
@@ -180,7 +180,7 @@ class EventView(nextcord.ui.View):
         Removes view and embed from recording message.
         Sends point information to database.
         """
-        if settings.point_settings.verify_events:
+        if settings.event_settings.verify:
             verification_channel: nextcord.TextChannel = interaction.guild.get_channel(settings.channel_ids.admin)
             verification_view = EventVerification(
                 self.event_participants.values.members, interaction.message.embeds[0].fields[1].value, self.host_id
@@ -339,7 +339,7 @@ def process_event(discord_users: list[nextcord.Member], non_discord_users: str,
         discord_users_list: list[str] = [str(user.id) for user in discord_users if user.id is not host_id]
         record_event_points(
             discord_users_list,
-            settings.point_settings.participate_points,
+            settings.event_settings.participate_points,
             is_member=True,
         )
 
@@ -347,8 +347,8 @@ def process_event(discord_users: list[nextcord.Member], non_discord_users: str,
         non_discord_users_list: list[str] = non_discord_users.split("\n")
         record_event_points(
             non_discord_users_list,
-            settings.point_settings.participate_points,
+            settings.event_settings.participate_points,
             is_member=False,
         )
 
-    record_event_points([host_id], settings.point_settings.host_points, is_member=True)
+    record_event_points([host_id], settings.event_settings.host_points, is_member=True)

cogs/commands/settings.py

@@ -144,67 +144,10 @@ class SettingsCog(commands.Cog, name="Settings Commands"):
         await interaction.response.send_message(f"Voting channel set to <#{channel_id}>.", ephemeral=True)
 
     @settings.subcommand()
-    async def point_settings(self, interaction: nextcord.Interaction) -> None:
+    async def event_settings(self, interaction: nextcord.Interaction) -> None:
         """Subcommand parent. Never called."""
 
-    @point_settings.subcommand(description="Sets Points value.")
-    async def clan_points(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Clan Points the recipient earns.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.clan_points to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to assign to PointSettings.points.
-        """
-        settings.point_settings.clan_points = points
-        settings.save()
-        await interaction.response.send_message(f"Points set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Weekly Limit value for Clan Points.")
-    async def clan_points_weekly_limit(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Clan Points a clan member can earn in a week.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.clan_points_weekly_limit to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to set.
-        """
-        settings.point_settings.clan_points_weekly_limit = points
-        settings.save()
-        await interaction.response.send_message(f"Clan Points Weekly Limit set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Weekly Limit value.")
-    async def events_weekly_limit(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Event Points a clan member can earn in a week.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.events_weekly_limit to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to set.
-        """
-        settings.point_settings.events_weekly_limit = points
-        settings.save()
-        await interaction.response.send_message(f"Event Weekly Limit set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Host Points value.")
+    @event_settings.subcommand(description="Sets Event Host Points value.")
     async def host_points(
         self,
         interaction: nextcord.Interaction,
@@ -213,17 +156,17 @@ class SettingsCog(commands.Cog, name="Settings Commands"):
         ),
     ) -> None:
         """
-        Sets DakinySettings point_settings.host_points to the given number of points.
+        Sets DakinySettings event_settings.host_points to the given number of points.
 
         Args:
             interaction (nextcord.Interaction): Discord interaction of command.
             points (int): Number of points to set.
         """
-        settings.point_settings.host_points = points
+        settings.event_settings.host_points = points
         settings.save()
         await interaction.response.send_message(f"Event Host Points set to {points}.", ephemeral=True)
 
-    @point_settings.subcommand(description="Sets Event Participation Points value.")
+    @event_settings.subcommand(description="Sets Event Participation Points value.")
     async def participate_points(
         self,
         interaction: nextcord.Interaction,
@@ -234,18 +177,18 @@ class SettingsCog(commands.Cog, name="Settings Commands"):
         ),
     ) -> None:
         """
-        Sets DakinySettings point_settings.participate_points to the given number of points.
+        Sets DakinySettings event_settings.participate_points to the given number of points.
 
         Args:
             interaction (nextcord.Interaction): Discord interaction of command.
             points (int): Number of points to set.
         """
-        settings.point_settings.participate_points = points
+        settings.event_settings.participate_points = points
         settings.save()
         await interaction.response.send_message(f"Event Participation Points set to {points}.", ephemeral=True)
 
-    @point_settings.subcommand(description="Sets whether to verify a clan point entry.")
-    async def verify_clan_points(
+    @event_settings.subcommand(description="Sets Event Participation Points value.")
+    async def verify(
         self,
         interaction: nextcord.Interaction,
         do_verification: bool = nextcord.SlashOption(  # noqa: FBT001
@@ -254,35 +197,34 @@ class SettingsCog(commands.Cog, name="Settings Commands"):
         ),
     ) -> None:
         """
-        Sets DakinySettings point_settings.verify_clan_points to the given number of points.
+        Sets DakinySettings event_settings.verify to the given number of points.
 
         Args:
             interaction (nextcord.Interaction): Discord interaction of command.
             do_verification (bool): If the bot should verify events.
         """
-        settings.point_settings.verify_clan_points = do_verification
+        settings.event_settings.verify = do_verification
         settings.save()
         await interaction.response.send_message(f"Event verification set to {do_verification}.", ephemeral=True)
 
-    @point_settings.subcommand(description="Sets whether an event.")
-    async def verify_events(
+    @event_settings.subcommand(description="Sets Event Weekly Limit value.")
+    async def weekly_limit(
         self,
         interaction: nextcord.Interaction,
-        do_verification: bool = nextcord.SlashOption(  # noqa: FBT001
-            required=True,
-            description="Whether an event should be verified or not.",
+        points: int = nextcord.SlashOption(
+            required=True, description="Number of Event Points a clan member can earn in a week.", min_value=0
         ),
     ) -> None:
         """
-        Sets DakinySettings point_settings.verify_events to the given number of points.
+        Sets DakinySettings event_settings.weekly_limit to the given number of points.
 
         Args:
             interaction (nextcord.Interaction): Discord interaction of command.
-            do_verification (bool): If the bot should verify events.
+            points (int): Number of points to set.
         """
-        settings.point_settings.verify_events = do_verification
+        settings.event_settings.weekly_limit = points
         settings.save()
-        await interaction.response.send_message(f"Event verification set to {do_verification}.", ephemeral=True)
+        await interaction.response.send_message(f"Event Weekly Limit set to {points}.", ephemeral=True)
 
     @settings.subcommand()
     async def role_ids(self, interaction: nextcord.Interaction) -> None:

cogs/commands/test.py

@@ -5,7 +5,7 @@ from nextcord.ext import application_checks, commands
 
 from classes.election import Election
 from DakinySettings import settings
-from utils import GUILDS, get_active_election_cycle
+from utils import GUILDS, get_active_election_cycle, get_quarter_name
 
 ME = 206602713511886849
 
@@ -141,3 +141,15 @@ class TestCog(commands.Cog, name="Test commands."):
         )
         await cycle.term_start_action()
         await interaction.send("Test command sent.", ephemeral=True)
+
+    @test.subcommand()
+    @is_me()
+    async def get_quarter_name(self, interaction: nextcord.Interaction) -> None:
+        """
+        Tests getting the quarter name.
+
+        Args:
+            interaction (nextcord.Interaction): Interaction with the message.
+        """
+        name = get_quarter_name()
+        await interaction.send(name)

database_setup/database.sql

@@ -59,19 +59,4 @@ CREATE TABLE EventPointsLimit (
     Points int unsigned DEFAULT 0,
     Week varchar(7) not null,
     PRIMARY KEY (UserId, Week)
-);
-
-CREATE TABLE ClanPoints (
-    QuarterName varchar(30) not null,
-    UserId varchar(32) not null,
-    DiscordMember boolean not null,
-    Points int unsigned DEFAULT 0,
-    PRIMARY KEY (QuarterName, UserId)
-);
-
-CREATE TABLE ClanPointsLimit (
-    UserId varchar(32) not null,
-    Points int unsigned DEFAULT 0,
-    Week varchar(7) not null,
-    PRIMARY KEY (UserId, Week)
 );

database_setup/sql_data_classes.py

@@ -10,13 +10,11 @@ Base = automap_base()
 Base.prepare(autoload_with=engine)
 
 # define the classes
-ClanPoints = Base.classes.ClanPoints
-ClanPointsLimit = Base.classes.ClanPointsLimit
 CouncilMembers = Base.classes.CouncilMembers
 ElectionInformation = Base.classes.ElectionInformation
-EventPoints = Base.classes.EventPoints
 EventPointsLimit = Base.classes.EventPointsLimit
 Messages = Base.classes.Messages
+EventPoints = Base.classes.EventPoints
 Presences = Base.classes.Presences
 UserBirthday = Base.classes.UserBirthday
 Votes = Base.classes.Votes

pyproject.toml

@@ -20,7 +20,7 @@ dataclass-wizard = "^0.22.3"
 
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.6.9"
+ruff = "^0.6.3"
 
 [build-system]
 requires = ["poetry-core"]

utils.py

@@ -48,10 +48,10 @@ def get_datetime(day: str) -> datetime:
     day = int(day.split("/")[1])
 
     # ensure that year rolls over if current month is December and the next month is less than 12.
-    if today.month == calendar.DECEMBER and month < calendar.DECEMBER:
+    if today.month == calendar.DECEMBER and month < calendar.OCTOBER:
         year += 1
 
-    if today.month == calendar.JANUARY and month > calendar.JANUARY:
+    if today.month == calendar.JANUARY and month > calendar.MARCH:
         year -= 1
 
     return datetime(year, month, day, tzinfo=UTC)
@@ -309,7 +309,7 @@ def record_event_points(users: Sequence[str], add_points: int, *, is_member: boo
 
             points = session.scalar(stmt)
             if points is None:
-                add_points = get_allowed_points(session, settings.point_settings.events_weekly_limit, user, add_points)
+                add_points = get_allowed_points(session, settings.event_settings.weekly_limit, user, add_points)
                 new_points = EventPoints(
                     QuarterName=quarter_name,
                     UserId=user,
@@ -318,7 +318,7 @@ def record_event_points(users: Sequence[str], add_points: int, *, is_member: boo
                 )
                 session.add(new_points)
             else:
-                add_points = get_allowed_points(session, settings.point_settings.events_weekly_limit, user, add_points)
+                add_points = get_allowed_points(session, settings.event_settings.weekly_limit, user, add_points)
                 points.Points += add_points
 
         session.commit()