Merge branch 'main' into main

Author: mbaruh

.github/dependabot.yml

@@ -1,6 +1,7 @@
 version: 2
+enable-beta-ecosystems: true
 updates:
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
       interval: "daily"

.github/workflows/lint-test.yml

@@ -7,18 +7,6 @@ jobs:
   lint-test:
     runs-on: ubuntu-latest
     env:
-      # List of licenses that are compatible with the MIT License and
-      # can be used in our project
-      ALLOWED_LICENSE: Apache Software License;
-        BSD License;
-        GNU Library or Lesser General Public License (LGPL);
-        ISC License (ISCL);
-        MIT License;
-        Mozilla Public License 2.0 (MPL 2.0);
-        Public Domain;
-        Python Software Foundation License;
-        The Unlicense (Unlicense)
-
       # Dummy values for required bot environment variables
       BOT_API_KEY: foo
       BOT_SENTRY_DSN: blah
@@ -31,27 +19,15 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Python Dependencies
-        uses: HassanAbouelela/actions/setup-python@setup-python_v1.6.0
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python_version: '3.12'
-
-      # Check all of our non-dev dependencies are compatible with the MIT license.
-      # If you added a new dependencies that is being rejected,
-      # please make sure it is compatible with the license for this project,
-      # and add it to the ALLOWED_LICENSE variable
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+          activate-environment: true
 
-      # NOTE: at time of writing pip-licenses is not PEP-639 compliant
-      #   so is not detecting the license for packages now following that style.
-      #   As a temp fix, add packages to the ignore list after manually checking
-      #   that the license in use is compatible with ours.
-      #   Ref: https://github.com/raimon49/pip-licenses/issues/225
-      - name: Check Dependencies License
-        run: |
-          poetry self add poetry-plugin-export
-          pip-licenses --allow-only="$ALLOWED_LICENSE" \
-            --ignore-packages attrs \
-            --package $(poetry export -f requirements.txt --without-hashes | sed "s/==.*//g" | tr "\n" " ")
+      - name: Install dependencies
+        run: uv sync --frozen
 
       - name: Run pre-commit hooks
         run: SKIP=ruff pre-commit run --all-files

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     - id: ruff
       name: ruff
       description: Run ruff linting
-      entry: poetry run ruff check --force-exclude
+      entry: uv run --frozen ruff check --force-exclude
       language: system
       'types_or': [python, pyi]
       require_serial: true

Dockerfile

@@ -1,16 +1,36 @@
-FROM --platform=linux/amd64 ghcr.io/owl-corp/python-poetry-base:3.12-slim
+ARG python_version=3.13-slim
+
+FROM python:$python_version AS builder
+COPY --from=ghcr.io/astral-sh/uv:0.7 /uv /bin/
+
+ENV UV_COMPILE_BYTECODE=1 \
+  UV_LINK_MODE=copy
+
+# Install project dependencies with build tools available
+WORKDIR /build
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+  --mount=type=bind,source=uv.lock,target=uv.lock \
+  --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+  uv sync --frozen --no-dev
+
+# -------------------------------------------------------------------------------
+
+FROM python:$python_version
 
 # Define Git SHA build argument for sentry
 ARG git_sha="development"
 ENV GIT_SHA=$git_sha
 
-# Install project dependencies
-WORKDIR /bot
-COPY pyproject.toml poetry.lock ./
-RUN poetry install --without dev
+# Install dependencies from build cache
+# .venv not put in /app so that it doesn't conflict with the dev
+# volume we use to avoid rebuilding image every code change locally
+COPY --from=builder /build /build
+ENV PATH="/build/.venv/bin:$PATH"
 
 # Copy the source code in last to optimize rebuilding the image
+WORKDIR /bot
 COPY . .
 
-ENTRYPOINT ["poetry"]
-CMD ["run", "python", "-m", "bot"]
+ENTRYPOINT ["python", "-m"]
+CMD ["bot"]

bot/constants.py

@@ -362,9 +362,9 @@ class _PythonNews(EnvConfig, env_prefix="python_news_"):
 class _VoiceGate(EnvConfig, env_prefix="voice_gate_"):
 
     delete_after_delay: int = 60
-    minimum_activity_blocks: int = 3
+    minimum_activity_blocks: int = 9 # 1h30m
     minimum_days_member: int = 3
-    minimum_messages: int = 50
+    minimum_messages: int = 25
 
 
 VoiceGate = _VoiceGate()

bot/exts/moderation/alts.py

@@ -159,6 +159,7 @@ async def alt_info_command(
             empty=True,
             max_lines=3,
             max_size=1000,
+            allowed_roles=constants.MODERATION_ROLES,
         )
 
     async def cog_check(self, ctx: commands.Context) -> bool:

bot/exts/moderation/infraction/management.py

@@ -421,7 +421,8 @@ async def send_infraction_list(
             prefix=f"{prefix}\n",
             empty=True,
             max_lines=3,
-            max_size=1000
+            max_size=1000,
+            allowed_roles=constants.MODERATION_ROLES,
         )
 
     def infraction_to_string(self, infraction: dict[str, t.Any], ignore_fields: tuple[str, ...]) -> str:

bot/exts/recruitment/talentpool/_cog.py

@@ -330,7 +330,13 @@ async def show_nominations_list(
             title="Talent Pool active nominations",
             color=Color.blue()
         )
-        await LinePaginator.paginate(lines, ctx, embed, empty=False)
+        await LinePaginator.paginate(
+            lines,
+            ctx,
+            embed,
+            empty=False,
+            allowed_roles=MODERATION_ROLES,
+        )
 
     async def list_nominations(
         self,
@@ -573,7 +579,8 @@ async def history_command(self, ctx: Context, user: MemberOrUser) -> None:
             embed=embed,
             empty=True,
             max_lines=3,
-            max_size=1000
+            max_size=1000,
+            allowed_roles=MODERATION_ROLES,
         )
 
     @nomination_group.command(name="end", aliases=("unwatch", "unnominate"), root_aliases=("unnominate",))

bot/exts/utils/extensions.py

@@ -1,6 +1,5 @@
-import functools
 import typing as t
-from enum import Enum
+from enum import Enum, member
 
 from discord import Colour, Embed
 from discord.ext import commands
@@ -23,10 +22,9 @@
 class Action(Enum):
     """Represents an action to perform on an extension."""
 
-    # Need to be partial otherwise they are considered to be function definitions.
-    LOAD = functools.partial(Bot.load_extension)
-    UNLOAD = functools.partial(Bot.unload_extension)
-    RELOAD = functools.partial(Bot.reload_extension)
+    LOAD = member(Bot.load_extension)
+    UNLOAD = member(Bot.unload_extension)
+    RELOAD = member(Bot.reload_extension)
 
 
 class Extensions(commands.Cog):

bot/exts/utils/reminders.py

@@ -574,7 +574,8 @@ async def list_reminders(self, ctx: Context) -> None:
 
         await LinePaginator.paginate(
             lines,
-            ctx, embed,
+            ctx,
+            embed,
             max_lines=3,
         )