diff --git a/cogs/commands/__init__.py b/cogs/commands/__init__.py index 9ebd402..7232b00 100644 --- a/cogs/commands/__init__.py +++ b/cogs/commands/__init__.py @@ -5,6 +5,7 @@ Cog loader. Adds all command cogs to the bot. from nextcord.ext import commands from cogs.commands.request import RequestCog +from cogs.commands.set import setCog from cogs.commands.test import TestCog @@ -14,5 +15,7 @@ def setup(bot: commands.Bot): """ Adds all command classes to bot. """ + bot.add_cog(RequestCog(bot)) bot.add_cog(TestCog(bot)) + bot.add_cog(setCog()) diff --git a/cogs/commands/set.py b/cogs/commands/set.py new file mode 100644 index 0000000..0b5925d --- /dev/null +++ b/cogs/commands/set.py @@ -0,0 +1,85 @@ +""" +Contains commands and views for set commands. +""" + +from datetime import datetime + +import nextcord +from nextcord.ext import commands +from sqlalchemy import delete, select +from sqlalchemy.exc import IntegrityError +from sqlalchemy.orm import Session + +from dakiny_bot import birthday_list +from database_setup.sql_data_classes import UserBirthday, engine + + +class setCog(commands.Cog, name="Set Commands"): + """ + Class holds set commands. + """ + + def __init__(self) -> None: + """ + Default constructor for SetCog class. Does nothing. + """ + + @nextcord.slash_command() + async def set(self, interaction: nextcord.Interaction): + """ + Parent slash command for set. Never called. + """ + + @set.subcommand(description="Sets your birth month and day for the Birthday Fun. Use 0/0 to remove yourself.") + async def birthday( + self, + interaction: nextcord.Interaction, + month: int = nextcord.SlashOption(required=True, min_value=0, max_value=12, description="Your birth month."), + day: int = nextcord.SlashOption(required=True, min_value=0, max_value=31, description="Your birth day."), + ): + """ + Sets a user's birthday in the database. Removes on input 0/0. If birthday is today, adds to the birthday_list. + + Args: + interaction (nextcord.Interaction): Interaction that invoked the command. + month (int, optional): The month a user was born. Is SlashOption. + day (int, optional): The day a user was born. Is SlashOption. + """ + + # Must be deferred, apparently datetime takes a little bit on invalid dates. + await interaction.response.defer(ephemeral=True) + + if month == 0 and day == 0: + stmt = delete(UserBirthday).where(UserBirthday.UserId == interaction.user.id) + with Session(engine) as session: + session.execute(stmt) + session.commit() + await interaction.followup.send("Removed birthday.", ephemeral=True) + return + + # check if valid day + today = datetime.today() + try: + birthday = datetime(today.year, month, day) + except ValueError: + await interaction.followup.send(f"Invalid date: {month}/{day}.", ephemeral=True) + return + + # If the birthday is today, add to birthday_list + if today.date() == birthday.date(): + birthday_list.append(interaction.user.id) + + new_birthday = UserBirthday(UserId=interaction.user.id, Birthday=f"{month}/{day}") + with Session(engine) as session: + try: + session.add(new_birthday) + session.commit() + except IntegrityError: + # User already has birthday, change it instead. + session.rollback() + stmt = select(UserBirthday).where(UserBirthday.UserId == interaction.user.id) + new_birthday = session.scalar(stmt) + new_birthday.Birthday = f"{month}/{day}" + session.commit() + + await interaction.followup.send(f"Birthday set to {month}/{day}.", ephemeral=True) diff --git a/cogs/loops/daily_loop.py b/cogs/loops/daily_loop.py index c92ca77..6433956 100644 --- a/cogs/loops/daily_loop.py +++ b/cogs/loops/daily_loop.py @@ -2,13 +2,18 @@ Defines the daily loop that runs the Dakiny bot functions. """ +import random from datetime import datetime, time from nextcord.ext import commands, tasks from pytz import timezone +from sqlalchemy import select +from sqlalchemy.orm import Session 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_datetime @@ -20,6 +25,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"): def __init__(self, bot: commands.Bot) -> None: self.bot = bot self.current_election = None + self.update_birthdays() # pylint doesn't recognize that daily_loop is subclassed from tasks.loop. self.daily_loop.start() # pylint: disable=no-member @@ -40,6 +46,8 @@ class DailyLoop(commands.Cog, name="Daily Loop"): if self.current_election.election_over: self.current_election = None + self.update_birthdays() + @daily_loop.before_loop async def before_loop(self): """ @@ -72,3 +80,21 @@ class DailyLoop(commands.Cog, name="Daily Loop"): current_election = ElectionCycle(cycle, config, self.bot.get_guild(config.params.guild_id)) return current_election + + def update_birthdays(self) -> None: + """ + Goes through database to collect all birthdays that are today. Adds user's id to birthday list. + """ + birthday_list.clear() + + # kandy's 1% chance + if random.randint(0, 99) == 0: + birthday_list.append(239547993106284544) + + today = datetime.today() + birthday = f"{today.month}/{today.day}" + + stmt = select(UserBirthday.UserId).where(UserBirthday.Birthday == birthday) + with Session(engine) as session: + to_add = session.scalars(stmt) + birthday_list.extend(to_add.all()) diff --git a/cogs/message_listener/__init__.py b/cogs/message_listener/__init__.py new file mode 100644 index 0000000..af6ab20 --- /dev/null +++ b/cogs/message_listener/__init__.py @@ -0,0 +1,43 @@ +""" +Defines cog for on message listener. +""" + +import nextcord +from nextcord.ext import commands + +from dakiny_bot import birthday_list + + +class SubmissionListener(commands.Cog, name="Message Listener"): + """Sets up message listener.""" + + def __init__(self, bot: commands.Bot): + self.bot = bot + + @commands.Cog.listener() + async def on_message(self, message: nextcord.Message): + """Listener for message creation. Adds score and attachments to submission.""" + # don't want to process any messages from bot. + if message.author.id == self.bot.user.id: + return + + await birthday_action(message) + + +# This function will be called when this extension is loaded. +# It is necessary to add these functions to the bot. +def setup(bot: commands.Bot): + """Adds function to bot""" + bot.add_cog(SubmissionListener(bot)) + + +async def birthday_action(message: nextcord.Message) -> None: + """ + Checks a message's auther and mentions to see if they are in the birthday list. + + Args: + message (nextcord.Message): The message to check for a birthday person. + """ + + if message.author.id in birthday_list or bool(set(message.raw_mentions) & set(birthday_list)): + await message.add_reaction("🎂") diff --git a/dakiny_bot.py b/dakiny_bot.py index a07dee5..076cd15 100644 --- a/dakiny_bot.py +++ b/dakiny_bot.py @@ -13,6 +13,8 @@ from config import DakinyConfig cs = ConfigStore.instance() cs.store(name="dakiny_config", node=DakinyConfig) +birthday_list: list[int] = [] + logger = logging.getLogger("nextcord") logger.setLevel(logging.DEBUG) handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w") diff --git a/database_setup/sql_data_classes.py b/database_setup/sql_data_classes.py index d7ed893..5f4897a 100644 --- a/database_setup/sql_data_classes.py +++ b/database_setup/sql_data_classes.py @@ -14,3 +14,4 @@ Base.prepare(autoload_with=engine) ElectionInformation = Base.classes.ElectionInformation CouncilMembers = Base.classes.CouncilMembers Votes = Base.classes.Votes +UserBirthday = Base.classes.UserBirthday