Merge branch 'main' into pre-commit-ci-update-config

Author: electron271

.pre-commit-config.yaml

@@ -44,10 +44,12 @@ repos:
       - id: ruff-format
 
     # 5. Project Config / Dependency Checks
-  - repo: https://github.com/python-poetry/poetry
-    rev: 2.1.3 # Use the latest tag from the repo
-    hooks:
-      - id: poetry-check
+  # TODO: Disabled due to a issue with "No module named 'jinja2'"
+  # relevant: https://github.com/mtkennerly/poetry-dynamic-versioning/issues/13
+  #- repo: https://github.com/python-poetry/poetry
+  #  rev: 2.1.3 # Use the latest tag from the repo
+  #  hooks:
+  #    - id: poetry-check
 
     # 6. Security Check
   - repo: https://github.com/gitleaks/gitleaks

poetry.lock

@@ -22,16 +22,6 @@ version = "0.0.0"
 enable = true
 metadata = true
 dirty = true
-# TODO: dirty causes issues with dockerization and always returns true, disabling for now
-#format-jinja = """
-#    {%- if distance == 0 -%}
-#        {{ serialize_pep440(base, stage, revision, metadata=[] + (["dirty"] if dirty else [])) }}
-#    {%- elif branch == "main" -%}
-#        {{ serialize_pep440(base, stage, revision, dev=distance, metadata=[commit] + (["dirty"] if dirty else [])) }}
-#    {%- else -%}
-#        {{ serialize_pep440(base, stage, revision, dev=distance, metadata=[commit, branch_escaped] + (["dirty"] if dirty else [])) }}
-#    {%- endif -%}
-#"""
 format-jinja = """
    {%- if distance == 0 -%}
        {{ serialize_pep440(base, stage, revision) }}
@@ -78,6 +68,7 @@ watchdog = "^6.0.0"
 arrow = "^1.3.0"
 click = "^8.1.8"
 levenshtein = "^0.27.1"
+jinja2 = "^3.1.6"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = ">=4.0.0"

pyproject.toml

@@ -66,7 +66,7 @@ async def logger(self) -> None:
                 guild_id = int(guild.guild_id)
 
                 # Collect data by querying controllers
-                starboard_stats = await self.db.starboard.find_many(where={"guild_id": guild_id})
+                starboard_stats = await self.db.starboard_message.find_many(where={"guild_id": guild_id})
 
                 snippet_stats = await self.db.snippet.find_many(where={"guild_id": guild_id})
 

tux/cogs/services/influxdblogger.py

@@ -53,13 +53,14 @@ async def afk(
 
         await add_afk(self.db, shortened_reason, target, ctx.guild.id, False)
 
-        await ctx.send(
+        await ctx.reply(
             content="\N{SLEEPING SYMBOL} || You are now afk! " + f"Reason: `{shortened_reason}`",
             allowed_mentions=discord.AllowedMentions(
                 users=False,
                 everyone=False,
                 roles=False,
             ),
+            ephemeral=True,
         )
 
     @commands.hybrid_command(name="permafk")
@@ -84,7 +85,7 @@ async def permafk(self, ctx: commands.Context[Tux], *, reason: str = "No reason.
         entry = await self.db.afk.get_afk_member(target.id, guild_id=ctx.guild.id)
         if entry is not None:
             await del_afk(self.db, target, entry.nickname)
-            await ctx.send("Welcome back!")
+            await ctx.send("Welcome back!", ephemeral=True)
             return
 
         shortened_reason = textwrap.shorten(reason, width=100, placeholder="...")
@@ -99,6 +100,7 @@ async def permafk(self, ctx: commands.Context[Tux], *, reason: str = "No reason.
                 everyone=False,
                 roles=False,
             ),
+            ephemeral=True,
         )
 
     @commands.Cog.listener("on_message")