change get election cycle name, add new function to get the current cycle for quarter name usage.
This commit is contained in:
@@ -7,7 +7,7 @@ from nextcord.ext import application_checks, commands
|
||||
|
||||
from classes.election_cycle import ElectionCycle
|
||||
from config import DakinyConfig
|
||||
from utils import get_current_cycle
|
||||
from utils import get_current_election_cycle
|
||||
|
||||
|
||||
def is_me():
|
||||
@@ -50,7 +50,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
@@ -67,7 +67,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
"""
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
@@ -84,7 +84,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
"""
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
@@ -101,7 +101,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
"""
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
@@ -112,7 +112,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
async def election_reminder(self, interaction: nextcord.Interaction):
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
@@ -123,7 +123,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
async def daily(self, interaction: nextcord.Interaction):
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
@@ -134,7 +134,7 @@ class TestCog(commands.Cog, name="Test commands."):
|
||||
async def term_start(self, interaction: nextcord.Interaction):
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = ElectionCycle(
|
||||
get_current_cycle(config),
|
||||
get_current_election_cycle(config),
|
||||
config,
|
||||
self.bot.get_guild(config.params.guild_id),
|
||||
)
|
||||
|
||||
@@ -15,7 +15,7 @@ from classes.election_cycle import ElectionCycle
|
||||
from config import DakinyConfig
|
||||
from dakiny_bot import birthday_list
|
||||
from database_setup.sql_data_classes import UserBirthday, engine
|
||||
from utils import get_current_cycle
|
||||
from utils import get_current_election_cycle
|
||||
|
||||
|
||||
class DailyLoop(commands.Cog, name="Daily Loop"):
|
||||
@@ -77,7 +77,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
|
||||
"""
|
||||
|
||||
config: DakinyConfig = self.bot.config
|
||||
cycle = get_current_cycle(config)
|
||||
cycle = get_current_election_cycle(config)
|
||||
|
||||
# prevent exception from using cycle as an Int in an array
|
||||
if cycle is None:
|
||||
|
||||
Reference in New Issue
Block a user