Change develop build to make a branch specific image.

.gitea/workflows/build_develop.yml

@@ -1,6 +1,10 @@
 name: build_develop
 
-on: [push]
+on: 
+  push:
+    branches:
+      - '*'
+      - '!main'
 
 jobs:
   build:
@@ -18,7 +22,9 @@ jobs:
           registry: gitea.cheezers.org
           username: imcompiling
           password: ${{ secrets.PASSWORD }}
+      - name: set env
+        run: echo "GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
       - name: Build Docker Image
-        run: docker build -t gitea.cheezers.org/imcompiling/dakiny-bot:develop .
+        run: docker build -t gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_BRANCH}} .
       - name: Push Docker Image
-        run: docker push gitea.cheezers.org/imcompiling/dakiny-bot:develop
+        run: docker push gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_BRANCH}}

.gitea/workflows/build_release.yml

@@ -0,0 +1,28 @@
+name: build_release
+
+on:
+  push:
+    tags: ["v[0-9].[0-9].[0-9]"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install Docker
+        uses: https://github.com/papodaca/install-docker-action@v1
+      - name: Log into container registry
+        uses: docker/login-action@v2
+        with:
+          registry: gitea.cheezers.org
+          username: imcompiling
+          password: ${{ secrets.PASSWORD }}
+      - name: Set env
+        run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Build Docker Image
+        run: docker build -t gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_TAG}} .
+      - name: Push Tagged Image
+        run: docker push gitea.cheezers.org/imcompiling/dakiny-bot:${{env.GIT_TAG}}

.gitignore

@@ -139,4 +139,4 @@ TODO.txt
 sql_tester.py
 conf
 outputs
-dakiny.db
+database

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8.10-slim
+FROM python:3.10.6-slim
 
 # install dependencies for mysqlclient
 # RUN apt-get update && apt-get -y upgrade && apt-get -y install python3-dev default-libmysqlclient-dev build-essential
@@ -7,11 +7,16 @@ RUN pip install --upgrade pip
 
 WORKDIR /home
 
-COPY cogs cogs/
-COPY dakiny_bot.py dakiny_bot.py
 COPY requirements.txt requirements.txt
+
 COPY config.py config.py
+COPY dakiny_bot.py dakiny_bot.py
+COPY utils.py utils.py
+
+COPY bot_messages bot_messages/
 COPY classes classes/
+COPY cogs cogs/
+COPY database_setup database_setup/
 
 RUN pip install -r requirements.txt
 

bot_messages/election_announcement.txt

@@ -34,16 +34,16 @@ The Clan Council will be denoted by the Discord ranks of <@&{clan_council_id}> a
 <:Rank_Owner:479008325137072155> Clan Leader
 ---message_break---
 __Here's the timeline:__
-Election begins: {election_start_date}
-Term: {term_start_date} - {term_end_date}
+Election begins: {election_start}
+Term: {term_start} - {term_end}
 
-**{election_start_date}**: Post here to announce candidacy
-**{voting_start_date}**: Voting begins
-**{voting_end_date}**: Votes are tallied and winners are announced
-**{highcouncil_election_date}**: The new Clan Council votes who among them shall receive the two High Council positions of: Clan Leader and Discord Server Manager.
-**{term_start_date}**: The new Clan Council is officially inaugurated and a drop party (or a giveaway event) begins to commemorate the new leadership.
+**{election_start}**: Post here to announce candidacy
+**{voting_start}**: Voting begins
+**{voting_end}**: Votes are tallied and winners are announced
+**{highcouncil_election}**: The new Clan Council votes who among them shall receive the two High Council positions of: Clan Leader and Discord Server Manager.
+**{term_start}**: The new Clan Council is officially inaugurated and a drop party (or a giveaway event) begins to commemorate the new leadership.
 
-This process will begin again next quarter on {next_election_start_date} with the inauguration scheduled for {term_end_date}.
+This process will begin again next quarter on {next_election_start} with the inauguration scheduled for {term_end}.
 ---message_break---
 **You may now announce your candidacy for a seat on the Dakiny Clan Council!
 **

bot_messages/vote_start.txt

@@ -2,7 +2,7 @@
 <@&{clan_member_id}>, it's time to vote for clan council.
 
 React with <{voting_emote_id}> to vote.
-Voting ends next {voting_end_day}, {voting_end_date}.
+Voting ends next {voting_end_day}, {voting_end}.
 Results will then be announced.
 
 After a candidate receives 3 votes, their spot is secured in the new council, but you can still vote for them to show your support.

classes/election_cycle.py

@@ -2,14 +2,14 @@
 Contains the election cycle class
 """
 
-from datetime import datetime, timedelta
+from datetime import datetime
 
 import nextcord
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from config import DakinyConfig
-from database.sql_data_classes import ElectionInformation, engine
+from database_setup.sql_data_classes import ElectionInformation, engine
 from utils import get_datetime
 
 
@@ -21,14 +21,14 @@ class ElectionCycle:
 
     def __init__(self, cycle: int, config: DakinyConfig, guild: nextcord.Guild) -> None:
         """
-        Generates all dates relevant to the election cycle from input election start, term start and end dates.
+        Generates all dates relevant to the election cycle determined by the config and cycle.
 
         Args:
-            election_start (datetime): Date the election cycle starts.
-            term_start (datetime): Date the term being elected starts.
-            term_end (datetime): Date the term being elected ends.
-            bot: the discord bot instance
+            cycle (int): Which election cycle this cycle is.
+            config (DakinyConfig): The entire config object.
+            guild (nextcord.Guild): The guild that this election is running in.
         """
+
         self.config: DakinyConfig = config
         self.cycle = cycle
         self.elecion_cycle = self.config.election_cycles[self.cycle]
@@ -37,9 +37,9 @@ class ElectionCycle:
         self.term_end: datetime = get_datetime(self.elecion_cycle.term_end)
         self.voting_start: datetime = get_datetime(self.elecion_cycle.voting_start)
         self.voting_end: datetime = get_datetime(self.elecion_cycle.voting_end)
-        self.highcouncil_election_announce: datetime = self.voting_end + timedelta(days=1)
-        self.highcouncil_election_start: datetime = self.highcouncil_election_announce + timedelta(days=3)
-        self.highcouncil_election_end: datetime = self.term_start - timedelta(days=1)
+        self.highcouncil_election_announce: datetime = get_datetime(self.elecion_cycle.highcouncil_election_announce)
+        self.highcouncil_election_start: datetime = get_datetime(self.elecion_cycle.highcouncil_election_start)
+        self.highcouncil_election_end: datetime = get_datetime(self.elecion_cycle.highcouncil_election_end)
         self.guild: nextcord.Guild = guild
         self.election_over: bool = False
 
@@ -55,18 +55,20 @@ class ElectionCycle:
         with open("bot_messages/election_announcement.txt", mode="r", encoding="utf8") as file:
             message = file.read()
 
-            next_election = get_datetime(self.config.election_cycles[(self.cycle + 1) % 4].election_start)
+            next_election = get_datetime(
+                self.config.election_cycles[(self.cycle + 1) % len(self.config.election_cycles)].election_start
+            )
 
             message = message.format(
                 clan_council_id=self.config.params.clan_council_role_id,
                 high_council_id=self.config.params.high_council_role_id,
-                election_start_date=self.election_start.strftime("%B %d"),
-                term_start_date=self.term_start.strftime("%B %d"),
-                term_end_date=self.term_end.strftime("%B %d"),
-                voting_start_date=self.voting_start.strftime("%B %d"),
-                voting_end_date=self.voting_end.strftime("%B %d"),
-                highcouncil_election_date=self.highcouncil_election_start.strftime("%B %d"),
-                next_election_start_date=next_election.strftime("%B %d"),
+                election_start=self.election_start.strftime("%B %d"),
+                term_start=self.term_start.strftime("%B %d"),
+                term_end=self.term_end.strftime("%B %d"),
+                voting_start=self.voting_start.strftime("%B %d"),
+                voting_end=self.voting_end.strftime("%B %d"),
+                highcouncil_election=self.highcouncil_election_start.strftime("%B %d"),
+                next_election_start=next_election.strftime("%B %d"),
             )
 
             return message.split("---message_break---")
@@ -87,7 +89,7 @@ class ElectionCycle:
                 highcouncil_election_announce=self.highcouncil_election_announce.strftime("%B %d"),
                 highcouncil_election_start=self.highcouncil_election_start.strftime("%B %d"),
                 highcouncil_election_end=self.highcouncil_election_end.strftime("%B %d"),
-                term_start_date=self.term_start.strftime("%B %d"),
+                term_start=self.term_start.strftime("%B %d"),
             )
 
     def build_highcouncil_vote_start(self) -> str:
@@ -103,7 +105,7 @@ class ElectionCycle:
 
             return message.format(
                 clan_council_elect_role_id=self.config.params.clan_council_elect_role_id,
-                term_start_date=self.term_start.strftime("%B %d"),
+                term_start=self.term_start.strftime("%B %d"),
             )
 
     def build_vote_start(self) -> str:
@@ -121,7 +123,7 @@ class ElectionCycle:
             return message.format(
                 clan_member_id=self.config.params.clan_member_role_id,
                 voting_emote_id=self.config.params.voting_emote_id,
-                voting_end_date=vote_end.strftime("%B %d"),
+                voting_end=vote_end.strftime("%B %d"),
                 voting_end_day=vote_end.strftime("%A"),
             )
 
@@ -135,7 +137,7 @@ class ElectionCycle:
         if today.date() == self.election_start.date():
             await self.election_start_action()
         elif today.date() == self.voting_start.date():
-            await self.voting_end_action()
+            await self.voting_start_action()
         elif today.date() == self.voting_end.date():
             await self.voting_end_action()
         elif today.date() == self.highcouncil_election_start.date():

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())

cogs/commands/request.py

@@ -99,5 +99,5 @@ class UsernameRequest(nextcord.ui.View):
             button (nextcord.ui.Button): Unused.
             interaction (nextcord.Interaction): The interaction of the user clicking the button.
         """
-        content = interaction.message.content + f"\nDenied by <@{interaction.user.id}.>"
+        content = interaction.message.content + f"\nDenied by <@{interaction.user.id}>."
         await interaction.response.edit_message(content=content, view=None)

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)

cogs/loops/daily_loop.py

@@ -2,13 +2,19 @@
 Defines the daily loop that runs the Dakiny bot functions.
 """
 
+import random
 from datetime import datetime, time
 
+import nextcord
 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
 
 
@@ -19,16 +25,11 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
 
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
-        self.current_election = self.get_current_cycle()
+        self.current_election = None
+        self.update_birthdays()
 
-    @commands.Cog.listener()
-    async def on_ready(self):
-        """
-        Starts the loop when bot is ready.
-        """
-        await self.bot.wait_until_ready()
-        # pylint doesn't recognize that periodic_update_guild_data is subclassed from tasks.loop.
-        await self.daily_loop.start()  # pylint: disable=no-member
+        # pylint doesn't recognize that daily_loop is subclassed from tasks.loop.
+        self.daily_loop.start()  # pylint: disable=no-member
 
     @tasks.loop(time=time(hour=0, tzinfo=timezone("GMT")))
     async def daily_loop(self):
@@ -46,6 +47,26 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
             if self.current_election.election_over:
                 self.current_election = None
 
+        self.update_birthdays()
+
+        if 239547993106284544 in birthday_list:
+            # inform kandy that it is her "birthday"
+            kandy: nextcord.User = await self.bot.fetch_user(239547993106284544)
+            await kandy.send('Happy "Birthday"!')
+
+        await self.cakedays()
+
+    @daily_loop.before_loop
+    async def before_loop(self):
+        """
+        Actions run before the loop starts. Want to wait for bot to be ready and get the current cycle.
+        """
+
+        await self.bot.wait_until_ready()
+
+        # Bot needs to know guilds to get the current cycle.
+        self.current_election = self.get_current_cycle()
+
     def get_current_cycle(self) -> ElectionCycle:
         """
         Creates an object for the current election cycle if one is active. An election is considered active
@@ -61,9 +82,47 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
 
         for cycle, election in enumerate(config.election_cycles):
             if (
-                today.date() > get_datetime(election.election_start).date()
-                and today.date() < get_datetime(election.term_start).date()
+                today.date() >= get_datetime(election.election_start).date()
+                and today.date() <= get_datetime(election.term_start).date()
             ):
                 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())
+
+    async def cakedays(self) -> None:
+        """
+        Loops through the guild's humans checking for joined_at dates that match today's date. Sends a message
+        saying happy cakeday.
+        """
+
+        today = datetime.today()
+        guild: nextcord.Guild = self.bot.get_guild(self.bot.config.params.guild_id)
+        announce_channel: nextcord.TextChannel = guild.get_channel(self.bot.config.params.general_channel_id)
+
+        cakedays: list[nextcord.Member] = [
+            human for human in guild.humans if human.joined_at.month == today.month and human.joined_at.day == today.day
+        ]
+
+        for member in cakedays:
+            years = today.year - member.joined_at.year
+            year_str = "years" if years > 1 else "year"
+            msg = f"Happy Cake day! <@{member.id}> joined the discord {years} {year_str} ago!"
+            await announce_channel.send(msg)

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("🎂")

config.py

@@ -11,14 +11,15 @@ class Params:
     """
 
     active_category_id: int
-    admin_channel_id: int
-    annoucement_category_id: int
+    admin_channel_id: int  # might want to rename this...
+    announcement_category_id: int
     archive_channel_group_id: int
     clan_council_elect_role_id: int
     clan_council_role_id: int
     clan_info_channel_id: int
     clan_member_role_id: int
     discord_token: str
+    general_channel_id: int
     guild_id: int
     high_council_role_id: int
     voting_emote_id: str
@@ -31,6 +32,9 @@ class ElectionCycle:
     """
 
     election_start: str
+    highcouncil_election_announce: str
+    highcouncil_election_end: str
+    highcouncil_election_start: str
     name: str
     term_end: str
     term_start: str

dakiny_bot.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import sys
 
@@ -6,12 +7,20 @@ import nextcord
 from hydra.core.config_store import ConfigStore
 from nextcord.ext import commands
 
-import database.create_database as create_database
+import database_setup.create_database as create_database
 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")
+handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+logger.addHandler(handler)
+
 
 @hydra.main(config_path="conf", config_name="config")
 def main(cfg: DakinyConfig):
@@ -48,4 +57,6 @@ def main(cfg: DakinyConfig):
 
 if __name__ == "__main__":
     sys.argv.append("hydra.job.chdir=False")
-    main()
+    sys.argv.append("hydra/job_logging=none")
+    sys.argv.append("hydra/hydra_logging=none")
+    main()  # pylint: disable=no-value-for-parameter

database_setup/create_database.py

@@ -5,11 +5,11 @@ Small script to create the database if it doesn't already exist.
 import sqlite3
 from os.path import exists
 
-if not exists("dakiny.db"):
-    with sqlite3.connect("dakiny.db") as con:
+if not exists("database/dakiny.db"):
+    with sqlite3.connect("database/dakiny.db") as con:
         cur = con.cursor()
 
-        with open("database/database.sql", mode="r", encoding="utf-8") as file:
+        with open("database_setup/database.sql", mode="r", encoding="utf-8") as file:
             database_script = file.read()
             cur.executescript(database_script)
             con.commit()

database_setup/database.sql

@@ -1,6 +1,3 @@
--- CREATE DATABASE dakiny;
--- use dakiny;
-
 CREATE TABLE ElectionInformation(
     ElectionCycle varchar(30) not null unique,
     ElectionChannel bigint unsigned not null,
@@ -24,4 +21,10 @@ CREATE TABLE Votes(
     VotedForId bigint unsigned not null,
     FOREIGN KEY (ElectionCycle) REFERENCES ElectionInformation(ElectionCycle),
     PRIMARY KEY (ElectionCycle, VoterId)
+);
+
+CREATE TABLE UserBirthday (
+    UserId bigint unsigned not null,
+    Birthday varchar(5) not null,
+    PRIMARY KEY (UserId)
 );

database_setup/sql_data_classes.py

@@ -5,7 +5,7 @@ from sqlalchemy import create_engine
 from sqlalchemy.ext.automap import automap_base
 
 # connect with sql alchemy and autoload schema
-URL = "sqlite+pysqlite:///dakiny.db"
+URL = "sqlite+pysqlite:///database/dakiny.db"
 engine = create_engine(URL)
 Base = automap_base()
 Base.prepare(autoload_with=engine)
@@ -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