Add timestamp to description.

.dockerignore

@@ -0,0 +1,4 @@
+.*
+Dockerfile
+renovate.json
+README.md

.editorconfig

@@ -0,0 +1,16 @@
+# see https://editorconfig.org/
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

.gitea/workflows/build_develop.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_latest.yaml

@@ -17,11 +17,11 @@ jobs:
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling
-          password: $${{ secrets.PASSWORD }}
+          password: ${{ secrets.PASSWORD }}
       - name: Build Docker Image
         run: docker build -t gitea.cheezers.org/imcompiling/off-cooldown-bot:latest .
       - name: Push Docker Image

.gitea/workflows/build_release.yaml

@@ -23,8 +23,6 @@ jobs:
       - name: Set env
         run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Build Docker Images
-        run: docker build -t gitea.cheezers.org/imcompiling/off-cooldown-bot:latest -t gitea.cheezers.org/imcompiling/off-cooldown-bot:${{env.GIT_TAG}} .
+        run: docker build -t gitea.cheezers.org/imcompiling/off-cooldown-bot:${{env.GIT_TAG}} .
-      - name: Push Latest Image
-        run: docker push gitea.cheezers.org/imcompiling/off-cooldown-bot:latest
       - name: Push Tagged Image
         run: docker push gitea.cheezers.org/imcompiling/off-cooldown-bot:${{env.GIT_TAG}}

.gitignore

@@ -129,4 +129,4 @@ dmypy.json
 nextcord.log
 outputs/
 
-database.db
+/database

.vscode/extensions.json

@@ -3,6 +3,7 @@
       "ms-python.vscode-pylance",
       "ms-python.python",
       "ms-python.debugpy",
-    "charliermarsh.ruff"
+      "charliermarsh.ruff",
+      "editorconfig.editorconfig"
   ]
 }

.vscode/launch.json

@@ -8,8 +8,8 @@
             "name": "Python: Module",
             "type": "debugpy",
             "request": "launch",
-      "module": "main",
+            "module": "off_cooldown_bot",
-      "justMyCode": true
+            "justMyCode": true,
         }
     ]
 }

.vscode/settings.json

@@ -5,7 +5,10 @@
         "reportAttributeAccessIssue": "warning"
     },
     "cSpell.words": [
+        "blurple",
         "cakeday",
-        "cakedays"
+        "cakedays",
+        "cooldown",
+        "nextcord"
     ]
 }

Dockerfile

@@ -3,14 +3,10 @@ FROM python:3.12.3-slim
 # install uv
 COPY --from=ghcr.io/astral-sh/uv:0.6.5 /uv /uvx /bin/
 
+COPY . /home
+
+# Sync the project into a new environment, using the frozen lockfile
 WORKDIR /home
-
-COPY config.py config.py
-COPY main.py main.py
-COPY pyproject.toml pyproject.toml
-
-COPY cogs cogs/
-
 RUN uv sync --frozen --no-dev
 
-CMD ["uv", "run", "./main.py"]
+CMD ["uv", "run", "--frozen", "--no-dev", "-m", "off_cooldown_bot"]

config.py

@@ -1,22 +0,0 @@
-"""
-File contains classes defining the Hydra configuraton structure.
-"""
-from dataclasses import dataclass
-
-
-@dataclass
-class Params:
-    """
-    Class defines the various configuration parameters.
-    """
-
-    discord_token: str
-
-
-@dataclass
-class BotConfig:
-    """
-    Class defines all configs required for Dakiny Bot.
-    """
-
-    params: Params

off_cooldown_bot/__init__.py

@@ -0,0 +1 @@
+"""Empty init file for off_cooldown_bot module."""

off_cooldown_bot/__main__.py

@@ -0,0 +1,14 @@
+"""Starts the app for off_cooldown_bot."""
+
+import logging
+
+from .app import run
+
+nextcord_logger = logging.getLogger("nextcord")
+nextcord_logger.setLevel(logging.DEBUG)
+nextcord_handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
+nextcord_handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+nextcord_logger.addHandler(nextcord_handler)
+
+if __name__ == "__main__":
+    run()

off_cooldown_bot/app.py

@@ -2,25 +2,20 @@
 
 from __future__ import annotations
 
-import logging
 import pathlib
 
 import nextcord
 from nextcord.ext import commands
 
-from logger import ocd_logger
+from off_cooldown_bot.open_raid import OpenRaid
-from settings import settings
 
-nextcord_logger = logging.getLogger("nextcord")
+from .logger import ocd_logger
-nextcord_logger.setLevel(logging.DEBUG)
+from .settings import settings
-nextcord_handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
-nextcord_handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
-nextcord_logger.addHandler(nextcord_handler)
 
 birthday_list: list[int] = []
 
 
-def main() -> None:
+def run() -> None:
     """Set config, intents, then connects the bot to discord."""
     # Allows privileged intents for monitoring members joining, roles editing, and role assignments
     # These need to be enabled in the developer portal as well
@@ -30,7 +25,7 @@ def main() -> None:
     intents.message_content = True
 
     # To enable the guilds privileged intent:
-    # intents.guilds = True
+    # intents.guilds = True  # noqa: ERA001
 
     # To enable the members privileged intent:
     intents.members = True
@@ -38,8 +33,8 @@ def main() -> None:
     bot = commands.Bot(intents=intents)
 
     # Get the modules of all cogs whose directory structure is ./cogs/<module_name>
-    for folder in pathlib.Path("cogs").iterdir():
+    for folder in pathlib.Path("./off_cooldown_bot/cogs").iterdir():
-        bot.load_extension(f"cogs.{folder.name}")
+        bot.load_extension(f"off_cooldown_bot.cogs.{folder.name}")
 
     @bot.listen()
     async def on_ready() -> None:
@@ -47,11 +42,8 @@ def main() -> None:
         if bot.user is None:
             ocd_logger.critical("Discord connection failed.")
             return
-        ocd_logger.info(f"{bot.user.name} has connected to Discord!")
+        bot.add_view(OpenRaid())
+        ocd_logger.info("%s has connected to Discord!", bot.user.name)
 
     # Run Discord bot
     bot.run(settings.params.discord_token)
-
-
-if __name__ == "__main__":
-    main()

off_cooldown_bot/cogs/commands/__init__.py

@@ -2,7 +2,9 @@
 
 from nextcord.ext import commands
 
-from cogs.commands.birthday import BirthdayCog
+from off_cooldown_bot.cogs.commands.test import TestCog
+
+from .birthday import BirthdayCog
 
 
 # This function will be called when this extension is loaded.
@@ -10,3 +12,4 @@ from cogs.commands.birthday import BirthdayCog
 def setup(bot: commands.Bot) -> None:
     """Add all command classes to bot."""
     bot.add_cog(BirthdayCog())
+    bot.add_cog(TestCog(bot))

off_cooldown_bot/cogs/commands/birthday.py

@@ -7,15 +7,16 @@ from nextcord.ext import commands
 from pytz import UTC
 from sqlmodel import Session, col, select
 
-from database.db import engine
+from off_cooldown_bot.app import birthday_list
-from database.models import UserBirthday
+from off_cooldown_bot.database.db import engine
-from main import birthday_list
+from off_cooldown_bot.database.models import UserBirthday
+from off_cooldown_bot.utils import GUILDS
 
 
 class BirthdayCog(commands.Cog, name="Birthday Commands"):
     """Class holds birthday commands."""
 
-    @nextcord.slash_command(guild_ids=[1000247361639030804, 822199658306076672])
+    @nextcord.slash_command(guild_ids=GUILDS)
     async def birthday(self, interaction: nextcord.Interaction) -> None:
         """Parent slash command for birthday. Never called."""
 

off_cooldown_bot/cogs/commands/test.py

@@ -0,0 +1,43 @@
+"""Commands for testing."""
+
+import nextcord
+from nextcord.ext import application_checks, commands
+
+from off_cooldown_bot.open_raid import OpenRaid, build_raid_embed
+from off_cooldown_bot.utils import GUILDS
+
+ME = 206602713511886849
+
+
+def is_me():  # noqa: ANN201
+    """Predicate that makes sure only I can run the test commands."""
+
+    def predicate(interaction: nextcord.Interaction) -> bool:
+        if interaction.user is None:
+            return False
+        return interaction.user.id == ME
+
+    return application_checks.check(predicate)
+
+
+class TestCog(commands.Cog, name="Test commands."):
+    """Class holds commands for testing."""
+
+    def __init__(self, bot: commands.Bot) -> None:
+        self.bot: commands.Bot = bot
+
+    @nextcord.slash_command(guild_ids=GUILDS)
+    async def test(self, interaction: nextcord.Interaction) -> None:
+        """Parent slash command for help. Never called."""
+
+    @test.subcommand()
+    @is_me()
+    async def open_raid(self, interaction: nextcord.Interaction) -> None:
+        """
+        Force starts election.
+
+        Args:
+            interaction (nextcord.Interaction): Interaction with the message.
+
+        """
+        await interaction.response.send_message("Starting an open raid.", embed=build_raid_embed(), view=OpenRaid())

off_cooldown_bot/cogs/loops/__init__.py

@@ -2,8 +2,8 @@
 
 from nextcord.ext import commands
 
-from cogs.loops.bot_presence import BotPresence
+from .bot_presence import BotPresence
-from cogs.loops.daily_loop import DailyLoop
+from .daily_loop import DailyLoop
 
 
 def setup(bot: commands.Bot) -> None:

off_cooldown_bot/cogs/loops/daily_loop.py

@@ -9,11 +9,12 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 from sqlmodel import col
 
-from database.db import engine
+from off_cooldown_bot.app import birthday_list
-from database.models import UserBirthday
+from off_cooldown_bot.database.db import engine
-from logger import ocd_logger
+from off_cooldown_bot.database.models import UserBirthday
-from main import birthday_list
+from off_cooldown_bot.logger import ocd_logger
-from settings import settings
+from off_cooldown_bot.open_raid import OpenRaid, build_raid_embed
+from off_cooldown_bot.settings import settings
 
 
 class DailyLoop(commands.Cog, name="Daily Loop"):
@@ -25,14 +26,35 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         self.update_birthdays()
         self.daily_loop.start()
 
-    @tasks.loop(time=time(hour=0, tzinfo=timezone("UTC")))
+    @tasks.loop(time=time(hour=0, tzinfo=UTC))
     async def daily_loop(self) -> None:
         """Run daily repeated functions."""
         self.update_birthdays()
 
         await self.cakedays()
 
+    @tasks.loop(time=time(hour=20, tzinfo=timezone("CST")))
+    async def open_raid(self) -> None:
+        """
+        Define the open raid loop.
+
+        Checks daily if it is Thursday and then posts the open raid sign up.
+        """
+        today = datetime.now(timezone("CST"))
+        if today.day + 2 == 5:
+            # open raid is on Saturday, post 2 days before
+            if (guild := self.bot.get_guild(settings.params.guild_id)) is None:
+                ocd_logger.error("Guild id not correct.")
+                return
+            if (channel := guild.get_channel(settings.channel_ids.raid)) is None or not isinstance(
+                channel, nextcord.TextChannel
+            ):
+                ocd_logger.error("Raid channel is not defined or is not a text channel.")
+                return
+            await channel.send(embed=build_raid_embed(), view=OpenRaid())
+
     @daily_loop.before_loop
+    @open_raid.before_loop
     async def before_loop(self) -> None:
         """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()

off_cooldown_bot/cogs/message_listener/__init__.py

@@ -3,7 +3,7 @@
 import nextcord
 from nextcord.ext import commands
 
-from main import birthday_list
+from off_cooldown_bot.app import birthday_list
 
 
 class SubmissionListener(commands.Cog, name="Message Listener"):

off_cooldown_bot/database/db.py

@@ -4,8 +4,7 @@ from sqlmodel import SQLModel, create_engine
 
 from . import models  # noqa: F401 - Need this import for creating the models.
 
-url = "sqlite:///database.db"
+url = "sqlite:///database/database.db"
 engine = create_engine(url)
 
-# Don't need to create all when connected to prod.
 SQLModel.metadata.create_all(engine)

off_cooldown_bot/logger.py

@@ -1,4 +1,4 @@
-"""Creates logger for Agon bot."""
+"""Creates logger for Off Cooldown bot."""
 
 import logging
 import sys

off_cooldown_bot/open_raid.py

@@ -0,0 +1,151 @@
+"""Contains functions for open raid sign-ups."""
+
+import datetime
+
+import nextcord
+
+from off_cooldown_bot.logger import ocd_logger
+
+MAX_TANKS = 2
+MAX_HEALERS = 2
+MAX_DPS = 25
+
+
+class OpenRaid(nextcord.ui.View):
+    """Class defines view for buttons on an open raid schedule message."""
+
+    def __init__(self) -> None:
+        super().__init__(timeout=None, auto_defer=True)
+
+    @nextcord.ui.button(label="Tank", style=nextcord.ButtonStyle.blurple, emoji="🛡️", custom_id="open_raid_tank")
+    async def tank(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None:  # noqa: ARG002
+        """
+        Signs a user up as a tank.
+
+        Removes them if they are already signed up.
+
+        Args:
+            button (nextcord.ui.Button): Un-used.
+            interaction (nextcord.Interaction): Interaction with command.
+
+        """
+        if interaction.message is None or interaction.user is None:
+            ocd_logger.warning("Command was called without a message or user.")
+            return
+
+        embed = interaction.message.embeds[0]
+        user_str = f"<@{interaction.user.id}>"
+
+        for index, field in enumerate(embed.fields):
+            if field.name == "Tanks":
+                values = [] if field.value is None else field.value.split("\n")
+                if user_str in values:
+                    values.remove(user_str)
+                else:
+                    if len(values) >= MAX_TANKS:
+                        await interaction.response.send_message(
+                            "Enough tanks have signed up, please choose another role.", ephemeral=True
+                        )
+                        return
+                    values.append(user_str)
+                embed.set_field_at(index, name=field.name, value="\n".join(values), inline=False)
+                break
+
+        await interaction.edit(embed=embed)
+
+    @nextcord.ui.button(label="Healer", style=nextcord.ButtonStyle.green, emoji="❤️", custom_id="open_raid_healer")
+    async def healer(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None:  # noqa: ARG002
+        """
+        Signs a user up as a healer.
+
+        Removes them if they are already signed up.
+
+        Args:
+            button (nextcord.ui.Button): Un-used.
+            interaction (nextcord.Interaction): Interaction with command.
+
+        """
+        if interaction.message is None or interaction.user is None:
+            ocd_logger.warning("Command was called without a message or user.")
+            return
+
+        embed = interaction.message.embeds[0]
+        user_str = f"<@{interaction.user.id}>"
+
+        for index, field in enumerate(embed.fields):
+            if field.name == "Healers":
+                values = [] if field.value is None else field.value.split("\n")
+                if user_str in values:
+                    values.remove(user_str)
+                else:
+                    if len(values) >= MAX_HEALERS:
+                        await interaction.response.send_message(
+                            "Enough healers have signed up, please choose another role.", ephemeral=True
+                        )
+                        return
+                    values.append(user_str)
+                embed.set_field_at(index, name=field.name, value="\n".join(values), inline=False)
+                break
+
+        await interaction.edit(embed=embed)
+
+    @nextcord.ui.button(label="DPS", style=nextcord.ButtonStyle.red, emoji="⚔️", custom_id="open_raid_dps")
+    async def dps(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None:  # noqa: ARG002
+        """
+        Signs a user up as dps.
+
+        Removes them if they are already signed up.
+
+        Args:
+            button (nextcord.ui.Button): Un-used.
+            interaction (nextcord.Interaction): Interaction with command.
+
+        """
+        if interaction.message is None or interaction.user is None:
+            ocd_logger.warning("Command was called without a message or user.")
+            return
+
+        embed = interaction.message.embeds[0]
+        user_str = f"<@{interaction.user.id}>"
+
+        for index, field in enumerate(embed.fields):
+            if field.name == "DPS":
+                values = [] if field.value is None else field.value.split("\n")
+                if user_str in values:
+                    values.remove(user_str)
+                else:
+                    if len(values) >= MAX_DPS:
+                        await interaction.response.send_message(
+                            "Enough dps have signed up, please choose another role.", ephemeral=True
+                        )
+                        return
+                    values.append(user_str)
+                embed.set_field_at(index, name=field.name, value="\n".join(values), inline=False)
+                break
+
+        await interaction.edit(embed=embed)
+
+
+def build_raid_embed() -> nextcord.Embed:
+    """
+    Build the open raid embed.
+
+    Returns:
+        nextcord.Embed: Embed that shows the raid's sign-ups.
+
+    """
+    today = datetime.datetime.now(tz=datetime.UTC).replace(hour=20)
+    saturday_idx = 5
+    days_delta = saturday_idx - today.weekday()
+    if days_delta < 0:
+        days_delta += 7
+    raid_time = today + datetime.timedelta(days_delta)
+
+    embed = nextcord.Embed(
+        title="Off Cooldown Open Raid", description=f"Raid time: t:{int(raid_time.timestamp())}:F", timestamp=raid_time
+    )
+    embed.add_field(name="Tanks", value="", inline=False)
+    embed.add_field(name="Healers", value="", inline=False)
+    embed.add_field(name="DPS", value="", inline=False)
+
+    return embed

off_cooldown_bot/settings.py

@@ -12,6 +12,7 @@ class ChannelIds:
     """Class holds all channel ids needed by bot."""
 
     general: int
+    raid: int
 
 
 @dataclass
@@ -35,3 +36,7 @@ class Settings(YAMLWizard):
 
 
 settings = Settings.from_yaml_file(CONFIG_LOCATION)
+
+# I'm not expecting a list to be returned.
+if isinstance(settings, list):
+    settings = settings[0]

off_cooldown_bot/utils.py

@@ -0,0 +1,3 @@
+"""File contains functions and variables used widely."""
+
+GUILDS = [1000247361639030804, 822199658306076672]

pyproject.toml

@@ -6,7 +6,6 @@ authors = [{ name = "imcompiling", email = "[email protected]" }]
 readme = "README.md"
 dependencies = [
     "nextcord>=2.6.0",
-    "python-dotenv>=1.0.1",
     "sqlmodel>=0.0.22",
     "dataclass-wizard[yaml]>=0.22.3,<1.0.0",
     "pytz>=2025.1",

uv.lock

@@ -306,7 +306,6 @@ source = { virtual = "." }
 dependencies = [
     { name = "dataclass-wizard", extra = ["yaml"] },
     { name = "nextcord" },
-    { name = "python-dotenv" },
     { name = "pytz" },
     { name = "sqlmodel" },
 ]
@@ -320,7 +319,6 @@ dev = [
 requires-dist = [
     { name = "dataclass-wizard", extras = ["yaml"], specifier = ">=0.22.3,<1.0.0" },
     { name = "nextcord", specifier = ">=2.6.0" },
-    { name = "python-dotenv", specifier = ">=1.0.1" },
     { name = "pytz", specifier = ">=2025.1" },
     { name = "sqlmodel", specifier = ">=0.0.22" },
 ]
@@ -438,15 +436,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/51/b2/b2b50d5ecf21acf870190ae5d093602d95f66c9c31f9d5de6062eb329ad1/pydantic_core-2.27.2-cp313-cp313-win_arm64.whl", hash = "sha256:ac4dbfd1691affb8f48c2c13241a2e3b60ff23247cbcf981759c768b6633cf8b", size = 1885186 },
 ]
 
-[[package]]
-name = "python-dotenv"
-version = "1.0.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/bc/57/e84d88dfe0aec03b7a2d4327012c1627ab5f03652216c63d49846d7a6c58/python-dotenv-1.0.1.tar.gz", hash = "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca", size = 39115 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/6a/3e/b68c118422ec867fa7ab88444e1274aa40681c606d59ac27de5a5588f082/python_dotenv-1.0.1-py3-none-any.whl", hash = "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a", size = 19863 },
-]
-
 [[package]]
 name = "pytz"
 version = "2025.1"