easterobot 1.1.0__tar.gz → 1.1.2__tar.gz

{easterobot-1.1.0 → easterobot-1.1.2}/.dockerignore

@@ -3,7 +3,10 @@
 !pyproject.toml
 !LICENSE
 !/easterobot/*.py
-!/easterobot/commands/*.py
+!/easterobot/*/*.py
+!/easterobot/*/*/*.py
+!/easterobot/alembic/script.py.mako
+!/easterobot/py.typed
 !/easterobot/resources
 !README.rst
 !entrypoint.sh

{easterobot-1.1.0 → easterobot-1.1.2}/.github/workflows/tests.yml

@@ -37,3 +37,16 @@ jobs:
 
       - name: Run tests
         run: uv run poe test
+  docker:
+    name: Docker build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build services with Docker Compose
+        run: docker compose -f docker-compose.yml build

{easterobot-1.1.0 → easterobot-1.1.2}/Dockerfile

@@ -2,8 +2,8 @@
 FROM python:3.12-slim
 
 # Metadata for clarity and documentation
-LABEL maintainer="your_email@example.com"
-LABEL description="Docker image for easterobot using uv for dependency management"
+LABEL maintainer="dashstrom.pro@gmail.com"
+LABEL description="Docker image for easterobot, a discord bot for easter events"
 
 # Add the UV binary
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
@@ -17,9 +17,6 @@ RUN mkdir /data
 # Make it read-only
 RUN chown easterobot:easterobot /data
 
-# Use non-root user for security
-USER easterobot
-
 # Change the working directory to the `src` directory
 WORKDIR /src
 
@@ -32,8 +29,16 @@ RUN uv sync --frozen --no-install-project
 # Copy the project into the image
 COPY . .
 
+# Fix permissions
+RUN find /src -type d -exec chmod 755 {} \;
+RUN find /src -type f -exec chmod 644 {} \;
+RUN chmod +x /src/entrypoint.sh
+
 # Sync the project
 RUN uv sync --frozen
 
+# Use non-root user for security
+USER easterobot
+
 # Default command (use exec form for signal handling)
 CMD ["/src/entrypoint.sh"]

{easterobot-1.1.0 → easterobot-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easterobot
-Version: 1.1.0
+Version: 1.1.2
 Summary: Discord bot for Easter.
 Project-URL: Homepage, https://github.com/Dashstrom/easterobot
 Project-URL: Repository, https://github.com/Dashstrom/easterobot
@@ -121,6 +121,11 @@ from `PyPI <https://pypi.org/project>`_
     cd easterobot
     echo "DISCORD_TOKEN=YOU_MUST_PUT_YOUR_TOKEN_HERE" > .env
 
+    # Can be unsafe
+    chmod -R 700 .
+    mkdir data
+    chmod 777 data
+
     # Run the docker container
     docker compose up -d
 

{easterobot-1.1.0 → easterobot-1.1.2}/README.rst

@@ -83,6 +83,11 @@ from `PyPI <https://pypi.org/project>`_
     cd easterobot
     echo "DISCORD_TOKEN=YOU_MUST_PUT_YOUR_TOKEN_HERE" > .env
 
+    # Can be unsafe
+    chmod -R 700 .
+    mkdir data
+    chmod 777 data
+
     # Run the docker container
     docker compose up -d
 

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/base.py

@@ -5,10 +5,10 @@ import functools
 import logging
 from collections.abc import Coroutine
 from time import time
-from typing import Any, Callable, TypeVar, Union, cast
+from typing import Any, Callable, Optional, TypeVar, Union, cast
 
 import discord
-from discord import app_commands
+from discord import Permissions, app_commands
 from sqlalchemy import and_, delete
 from sqlalchemy.ext.asyncio import AsyncSession
 from typing_extensions import Concatenate, ParamSpec
@@ -54,19 +54,22 @@ Interaction = discord.Interaction[Easterobot]
 Coro = Coroutine[Any, Any, T]
 
 
-def controlled_command(
-    *, cooldown: bool = True, **perms: bool
+def controlled_command(  # noqa: C901, PLR0915
+    *,
+    cooldown: bool = True,
+    channel_permissions: Optional[dict[str, bool]] = None,
+    **perms: bool,
 ) -> Callable[
     [Callable[Concatenate[Context, P], Coro[None]]],
     Callable[Concatenate[Interaction, P], Coro[None]],
 ]:
     """Add a cooldown and permission check."""
 
-    def decorator(
+    def decorator(  # noqa: C901
         f: Callable[Concatenate[Context, P], Coro[None]],
     ) -> Callable[Concatenate[Interaction, P], Coro[None]]:
         @functools.wraps(f)
-        async def decorated(
+        async def decorated(  # noqa: C901, PLR0911, PLR0912
             interaction: Interaction, *args: P.args, **kwargs: P.kwargs
         ) -> None:
             # Check if interaction is valid
@@ -91,6 +94,28 @@ def controlled_command(
                 logger.warning("No channel provided %s", interaction)
                 return
 
+            # Check bot can speak
+            if channel_permissions:
+                client_perms = discord.Permissions()
+                if interaction.client.user:
+                    client_member = interaction.guild.get_member(
+                        interaction.client.user.id
+                    )
+                    if client_member is not None:
+                        client_perms = interaction.channel.permissions_for(
+                            client_member
+                        )
+                needed_channel_perms = Permissions(**channel_permissions)
+                if not client_perms.is_superset(needed_channel_perms):
+                    logger.warning(
+                        "%s failed for wrong channel permissions", event_repr
+                    )
+                    await interaction.response.send_message(
+                        "Le bot n'a pas la permission",
+                        ephemeral=True,
+                    )
+                    return
+
             # Compute needed permissions
             needed_perms = discord.Permissions(**perms)
             have_perms = interaction.user.guild_permissions.is_superset(

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/disable.py

@@ -9,7 +9,8 @@ from .base import Context, controlled_command, egg_command_group
 
 
 @egg_command_group.command(
-    name="disable", description="Désactiver la chasse aux œufs dans le salon"
+    name="disable",
+    description="Désactiver la chasse aux œufs dans le salon"
 )
 @controlled_command(cooldown=True, manage_channels=True)
 async def disable_command(ctx: Context) -> None:

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/edit.py

@@ -13,7 +13,8 @@ from .base import Context, controlled_command, egg_command_group
 
 
 @egg_command_group.command(
-    name="edit", description="Editer le nombre d'œufs d'un membre"
+    name="edit",
+    description="Editer le nombre d'œufs d'un membre",
 )
 @controlled_command(cooldown=True, administrator=True)
 async def edit_command(

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/enable.py

@@ -9,9 +9,14 @@ from .base import Context, controlled_command, egg_command_group
 
 
 @egg_command_group.command(
-    name="enable", description="Activer la chasse dans le salon"
+    name="enable",
+    description="Activer la chasse dans le salon"
+)
+@controlled_command(
+    cooldown=True,
+    channel_permissions={"send_messages": True},
+    manage_channels=True,
 )
-@controlled_command(cooldown=True, manage_channels=True)
 async def enable_command(
     ctx: Context,
 ) -> None:

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/game.py

@@ -148,9 +148,10 @@ async def game_dual(  # noqa: C901, D103, PLR0912
 
 
 @egg_command_group.command(
-    name="connect4", description="Lancer une partie de puissance 4."
+    name="connect4",
+    description="Lancer une partie de puissance 4"
 )
-@controlled_command(cooldown=True)
+@controlled_command(cooldown=True, channel_permissions={"send_messages": True})
 async def connect4_command(
     ctx: Context,
     member: Optional[discord.Member] = None,
@@ -161,7 +162,8 @@ async def connect4_command(
 
 
 @egg_command_group.command(
-    name="tictactoe", description="Lancer une partie de morpion."
+    name="tictactoe",
+    description="Lancer une partie de morpion"
 )
 @controlled_command(cooldown=True)
 async def tictactoe_command(
@@ -175,7 +177,7 @@ async def tictactoe_command(
 
 @egg_command_group.command(
     name="rockpaperscissor",
-    description="Lancer une partie de pierre papier ciseaux.",
+    description="Lancer une partie de pierre papier ciseaux",
 )
 @controlled_command(cooldown=True)
 async def rockpaperscissor_command(

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/help.py

@@ -7,7 +7,10 @@ from easterobot.hunts.hunt import embed
 from .base import Context, controlled_command, egg_command_group
 
 
-@egg_command_group.command(name="help", description="Obtenir de l'aide")
+@egg_command_group.command(
+    name="help",
+    description="Obtenir l'aide des commandes"
+)
 @controlled_command(cooldown=True)
 async def help_command(ctx: Context) -> None:
     """Help command."""

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/reset.py

@@ -14,7 +14,8 @@ from .base import Context, Interaction, controlled_command, egg_command_group
 
 
 @egg_command_group.command(
-    name="reset", description="Réinitialiser la chasse aux œufs"
+    name="reset",
+    description="Réinitialiser la chasse aux œufs"
 )
 @controlled_command(cooldown=True, administrator=True)
 async def reset_command(ctx: Context) -> None:

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/commands/search.py

@@ -21,8 +21,11 @@ from .base import (
 logger = logging.getLogger("easterobot")
 
 
-@egg_command_group.command(name="search", description="Rechercher un œuf")
-@controlled_command(cooldown=True)
+@egg_command_group.command(
+    name="search",
+    description="Rechercher un œuf"
+)
+@controlled_command(cooldown=True, channel_permissions={"send_messages": True})
 async def search_command(ctx: Context) -> None:
     """Search command."""
     async with AsyncSession(ctx.client.engine) as session:

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/config.py

@@ -30,7 +30,7 @@ V = TypeVar("V")
 Members = Union[discord.Member, list[discord.Member]]
 
 HERE = pathlib.Path(__file__).parent.resolve()
-RESOURCES = pathlib.Path(__file__).parent.resolve() / "resources"
+RESOURCES = HERE / "resources"
 DEFAULT_CONFIG_PATH = pathlib.Path("config.yml")
 EXAMPLE_CONFIG_PATH = RESOURCES / "config.example.yml"
 

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/games/rock_paper_scissor.py

@@ -166,7 +166,7 @@ class RockPaperScissor(Game):
             if not self.timeout:
                 await self.set_winner(final_winner)
         else:
-            dt = self.start_timer(63)
+            dt = self.start_timer(32)
             embed.description += f"\n\n{info}\n\nFin du tour {dt}"
         embed.set_author(name=header, icon_url=icon_url)
         await self.message.edit(embed=embed, view=self.view, content="")

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/games/tic_tac_toe.py

@@ -85,7 +85,7 @@ class TicTacToe(Game):
         content += footer
 
         if not self.terminate:
-            now = datetime.datetime.now() + datetime.timedelta(seconds=62)  # noqa: DTZ005
+            now = datetime.datetime.now() + datetime.timedelta(seconds=32)  # noqa: DTZ005
             content += f"\n\nFin du tour {format_dt(now, style='R')}"
 
         embed = discord.Embed(description=content, color=self.color(user))
@@ -142,7 +142,7 @@ class TicTacToe(Game):
                 await self.set_winner(None)
             else:
                 self.turn += 1
-                self.start_timer(60)
+                self.start_timer(30)
             await self.update()
 
     @override

{easterobot-1.1.0 → easterobot-1.1.2}/easterobot/resources/config.example.yml

@@ -13,8 +13,8 @@ hunt:
   timeout: 300.0
   game: 0.6
   cooldown:
-    min: 1200.0
-    max: 3000.0
+    min: 600.0
+    max: 1800.0
   weights:
     base: 0.3
     egg: 0.4

easterobot-1.1.2/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ ! -f /data/config.yml ]
+then
+  uv run --frozen easterobot generate /data || exit 1
+fi
+uv run --frozen easterobot run --config /data/config.yml --env

{easterobot-1.1.0 → easterobot-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "easterobot"
-version = "1.1.0"
+version = "1.1.2"
 description = "Discord bot for Easter."
 authors = [
     { name = "Dashstrom", email = "dashstrom.pro@gmail.com" }

{easterobot-1.1.0 → easterobot-1.1.2}/uv.lock

@@ -541,7 +541,7 @@ wheels = [
 
 [[package]]
 name = "easterobot"
-version = "1.1.0"
+version = "1.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },

easterobot-1.1.0/entrypoint.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ ! -f /data/config.yml ]
-then
-  uv run easterobot generate /data
-fi
-uv run easterobot run --config /data/config.yml --env