Update the create database script to account for directory structure change.

Reviewed-on: #85
Reviewed-by: imcompiling <[email protected]>

.gitea/workflows/build_develop.yaml

@@ -5,13 +5,15 @@ on:
     branches:
       - '*'
       - '!main'
+    paths-ignore:
+        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker

.gitea/workflows/build_latest.yaml

@@ -3,13 +3,15 @@ name: build_latest
 on:
   push:
     branches: [main]
+    paths-ignore:
+        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker

.gitea/workflows/build_release.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker

.gitignore

@@ -105,7 +105,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-poetry.lock
 
 # Spyder project settings
 .spyderproject

.vscode/settings.json

@@ -3,6 +3,8 @@
         "aiofiles",
         "autofilled",
         "blurple",
+        "CAKEDAY",
+        "cakedays",
         "CLANLEADER",
         "Dakiny",
         "DISCORDMANAGER",

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.3-slim
+FROM python:3.13.2-slim
 
 # install dependencies
 RUN apt-get update && apt-get -y upgrade && apt-get -y install git sqlite3

dakiny_bot/app.py

@@ -38,8 +38,8 @@ def run() -> None:
     bot = commands.Bot(intents=intents)
 
     # Get the modules of all cogs whose directory structure is ./cogs/<module_name>
-    for folder in os.listdir("cogs"):
-        bot.load_extension(f"cogs.{folder}")
+    for folder in os.listdir("dakiny_bot/cogs"):
+        bot.load_extension(f"dakiny_bot.cogs.{folder}")
 
     @bot.listen()
     async def on_ready() -> None:

dakiny_bot/classes/election.py

@@ -201,7 +201,7 @@ class Election:
         election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
         await election_thread.send(message)
         vote_msg = await election_thread.send(
-            build_votes_str(settings, self.guild),
+            build_votes_str(self.guild),
             view=VoteView(self.guild),
         )
 

dakiny_bot/classes/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.ruff]
 # Extend the `pyproject.toml` file in the parent directory...
-extend = "../pyproject.toml"
+extend = "../../pyproject.toml"
 
 # Exclude a variety of commonly ignored directories.
 exclude = ["gitea_webhook.py"]

dakiny_bot/classes/voting_views.py

@@ -67,7 +67,7 @@ class VoteSelect(nextcord.ui.StringSelect):
                 session.execute(stmt)
                 session.commit()
 
-        vote_message_str = build_votes_str(settings, interaction.guild)
+        vote_message_str = build_votes_str(interaction.guild)
         vote_msg: nextcord.Message = await interaction.channel.fetch_message(vote_msg_id)
         await vote_msg.edit(content=vote_message_str)
 

dakiny_bot/cogs/loops/daily_loop.py

@@ -20,6 +20,8 @@ if TYPE_CHECKING:
 
 KANDY = 239547993106284544
 
+IGNORE_CAKEDAY = [266378407682506754]
+
 
 class DailyLoop(commands.Cog, name="Daily Loop"):
     """Class for performing daily functions."""
@@ -112,7 +114,11 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         announce_channel: nextcord.TextChannel = guild.get_channel(settings.channel_ids.general)
 
         cakedays: list[nextcord.Member] = [
-            human for human in guild.humans if human.joined_at.month == today.month and human.joined_at.day == today.day
+            human
+            for human in guild.humans
+            if human.joined_at.month == today.month
+            and human.joined_at.day == today.day
+            and human.id not in IGNORE_CAKEDAY
         ]
 
         for member in cakedays:

dakiny_bot/database/__init__.py

@@ -0,0 +1 @@
+"""Module controls connection to Dakiny bot database."""

dakiny_bot/database/create_database.py

@@ -7,7 +7,7 @@ if not Path("database/dakiny.db").exists():
     with sqlite3.connect("database/dakiny.db") as con:
         cur = con.cursor()
 
-        with Path("database_setup/database.sql", encoding="utf-8").open() as file:
+        with Path("dakiny_bot/database/database.sql").open() as file:
             database_script = file.read()
             cur.executescript(database_script)
             con.commit()

dakiny_bot/database/pyproject.toml

@@ -1,7 +0,0 @@
-[tool.ruff]
-# Extend the `pyproject.toml` file in the parent directory...
-extend = "../pyproject.toml"
-
-[tool.ruff.lint]
-# ignore implicit-namespace-package in this directory.
-ignore = ["INP001"]

renovate.json

@@ -0,0 +1,20 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "lockFileMaintenance": {
+        "automerge": true,
+        "enabled": true
+    },
+    "minor": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "patch": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "pin": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "ignoreTests": true
+}