Merge branch 'allthingslinux:main' into main

Author: maningreen

.cursorrules

@@ -127,45 +127,13 @@
     },
     "error_handling": {
       "prefer_try_catch": true,
-      "log_errors": true
-    },
-    "naming_conventions": {
-      "variables": "snake_case",
-      "functions": "snake_case",
-      "classes": "PascalCase",
-      "interfaces": "PascalCase",
-      "files": "snake_case"
-    }
-  },
-  "project_configuration": {
-    "language": "Python",
-    "version": "3.13.2",
-    "dependencies": {
-      "management_tool": "Poetry",
-      "libraries": [
-        "discord.py",
-        "pyright",
-        "prisma",
-        "ruff",
-        "loguru",
-        "httpx",
-        "pre-commit",
-        "sentry-sdk",
-        "python-dotenv",
-        "pytz",
-        "pillow",
-        "rich",
-        "aiofiles",
-        "reactionmenu"
-      ]
+      "log_errors": true,
+      "logging_tool": "Loguru",
+      "exception_management": "Sentry and handlers/error.py"
     },
     "development": {
       "environment": "Docker",
       "deployment_tool": "Docker Compose"
-    },
-    "error_handling": {
-      "logging_tool": "Loguru",
-      "exception_management": "Sentry and handlers/error.py"
     }
   }
 }

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 default_language_version:
-  python: "3.13.2"
+  python: python3.13
 
 repos:
   # 1. Fast File Checks
@@ -31,15 +31,15 @@ repos:
     # 3. Main Linter (with auto-fix)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version should match the one in pyproject.toml
-    rev: v0.11.5 # Use the same Ruff version tag as formatter
+    rev: v0.11.6 # Use the same Ruff version tag as formatter
     hooks:
       - id: ruff
         args: [--fix]
 
     # 4. Main Formatter (after linting/fixing)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version should match the one in pyproject.toml
-    rev: v0.11.5
+    rev: v0.11.6
     hooks:
       - id: ruff-format
 

.trunk/.gitignore

@@ -0,0 +1,9 @@
+*out
+*logs
+*actions
+*notifications
+*tools
+plugins
+user_trunk.yaml
+user.yaml
+tmp

.trunk/trunk.yaml

@@ -0,0 +1,44 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
+version: 0.1
+cli:
+  version: 1.22.12
+# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.6.8
+      uri: https://github.com/trunk-io/plugins
+# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+runtimes:
+  enabled:
+    - [email protected]
+    - [email protected]
+# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
+lint:
+  disabled:
+    - bandit
+    - black
+    - ruff
+  enabled:
+    - [email protected]
+    - [email protected]
+    - git-diff-check
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+actions:
+  disabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+  enabled:
+    - trunk-upgrade-available

assets/emojis/tempban.png

@@ -1,3 +1,5 @@
+---
+
 # NOTE: This file is used for local development purposes only.
 
 services:

docker-compose.dev.yml

@@ -1,3 +1,5 @@
+---
+
 # NOTE: This file is used for production deployment.
 
 services:
@@ -11,6 +13,7 @@ services:
     volumes:
       - ./config:/app/config:ro
       - ./tux:/app/tux
+      - ./assets:/app/assets
     env_file:
       - .env
-    restart: unless-stopped
+    restart: unless-stopped

docker-compose.yml

@@ -61,6 +61,7 @@ types-dateparser = ">=1.2.0.20240420"
 types-psutil = ">=6.0.0.20240621"
 types-pytz = ">=2024.2.0.20240913"
 types-pyyaml = ">=6.0.12.20240808"
+types-pillow = "^10.2.0.20240822"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs-material = "^9.5.30"

poetry.lock

@@ -22,6 +22,7 @@
 from tux.database.client import db
 from tux.utils.banner import create_banner
 from tux.utils.config import Config
+from tux.utils.emoji import EmojiManager
 from tux.utils.env import is_dev_mode
 from tux.utils.sentry import start_span, start_transaction
 
@@ -84,6 +85,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         # Store for tracking Sentry transactions by command/interaction ID
         self.active_sentry_transactions: dict[int, Any] = {}
 
+        # Emoji manager
+        self.emoji_manager = EmojiManager(self)
+
         # Create console for rich output
         self.console = Console(stderr=True, force_terminal=True)
 
@@ -246,8 +250,9 @@ async def on_ready(self) -> None:
         Performs initialization tasks when the bot connects to Discord:
         1. Records start time if not set
         2. Ensures setup is complete
-        3. Starts hot reloading for cogs (loaded as separate cog)
-        4. Logs startup banner
+        3. Initializes emoji manager
+        4. Starts hot reloading for cogs (loaded as separate cog)
+        5. Logs startup banner
 
         Notes
         -----
@@ -264,6 +269,17 @@ async def on_ready(self) -> None:
             await self._wait_for_setup()
             transaction.set_tag("setup_complete", self.setup_complete)
 
+            # Initialize emoji manager after bot is connected to Discord
+            with start_span("bot.init_emoji_manager", "Initializing emoji manager") as span:
+                try:
+                    await self.emoji_manager.init()
+                    logger.info("Emoji manager initialized")
+                    span.set_tag("emoji_manager.initialized", True)
+                except Exception as e:
+                    logger.warning(f"Failed to initialize emoji manager: {e}")
+                    span.set_tag("emoji_manager.initialized", False)
+                    span.set_data("error", str(e))
+
             # Start hot reloading - import at function level to avoid circular imports
             with start_span("bot.load_hot_reload", "Setting up hot reload") as span:
                 try: