From 62f99022983642906d2510e7be477755cf353cb3 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 3 Sep 2024 16:07:23 -0400 Subject: [PATCH] Remove config param from get_current_election_cycle(). Update test.py to use new settings. --- cogs/commands/test.py | 42 ++++++++++++++-------------------------- cogs/loops/daily_loop.py | 2 +- utils.py | 8 ++++---- 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/cogs/commands/test.py b/cogs/commands/test.py index 2de4b7b..789d1d4 100644 --- a/cogs/commands/test.py +++ b/cogs/commands/test.py @@ -1,17 +1,12 @@ """Commands for testing.""" -from typing import TYPE_CHECKING - import nextcord from nextcord.ext import application_checks, commands from classes.election import Election +from DakinySettings import settings from utils import GUILDS, get_current_election_cycle -if TYPE_CHECKING: - from DakinySettings import DakinySettings - - ME = 206602713511886849 @@ -44,10 +39,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.election_start_action() await interaction.send("Test command sent.", ephemeral=True) @@ -61,10 +55,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.voting_start_action() await interaction.send("Test command sent.", ephemeral=True) @@ -78,10 +71,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.voting_end_action() await interaction.send("Test command sent.", ephemeral=True) @@ -95,10 +87,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.highcouncil_election_start_action() await interaction.send("Test command sent.", ephemeral=True) @@ -112,10 +103,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.election_reminder() await interaction.send("Test command sent.", ephemeral=True) @@ -129,10 +119,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.check_date() await interaction.send("Test command sent.", ephemeral=True) @@ -146,10 +135,9 @@ class TestCog(commands.Cog, name="Test commands."): Args: interaction (nextcord.Interaction): Interaction with the message. """ - config: DakinySettings = self.bot.config cycle = Election( - get_current_election_cycle(config), - self.bot.get_guild(config.params.guild_id), + get_current_election_cycle(), + self.bot.get_guild(settings.params.guild_id), ) await cycle.term_start_action() await interaction.send("Test command sent.", ephemeral=True) diff --git a/cogs/loops/daily_loop.py b/cogs/loops/daily_loop.py index 2980e4b..c22018e 100644 --- a/cogs/loops/daily_loop.py +++ b/cogs/loops/daily_loop.py @@ -75,7 +75,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"): Returns: Election: Current election cycle, None if there is no election happening. """ - cycle = get_current_election_cycle(settings) + cycle = get_current_election_cycle() # prevent exception from using cycle as an Int in an array if cycle is None: diff --git a/utils.py b/utils.py index d8495ea..2f6ecec 100644 --- a/utils.py +++ b/utils.py @@ -64,7 +64,7 @@ def get_election_name() -> str: Returns: str: the name of the election cycle """ - cycle = get_current_election_cycle(settings) + cycle = get_current_election_cycle() current_cycle = settings.election_cycles[cycle] return f"vote-{get_datetime(current_cycle.term_start).year}-{current_cycle.name}" @@ -85,7 +85,7 @@ def get_quarter_name() -> str: return f"{get_datetime(current_cycle.term_start).year}-{current_cycle.name}" -def get_current_election_cycle(config: DakinySettings) -> int: +def get_current_election_cycle() -> int: """ Returns index for active election. An election is considered active between the election start and the term start. @@ -97,7 +97,7 @@ def get_current_election_cycle(config: DakinySettings) -> int: """ today = datetime.now(tz=UTC) - for cycle, election in enumerate(config.election_cycles): + for cycle, election in enumerate(settings.election_cycles): if ( today.date() >= get_datetime(election.election_start).date() and today.date() <= get_datetime(election.term_start).date() @@ -105,7 +105,7 @@ def get_current_election_cycle(config: DakinySettings) -> int: return cycle # It isn't a current election, get the quarter - return get_quarter_cycle(config) + return get_quarter_cycle(settings) def get_quarter_cycle(config: DakinySettings) -> int: