easterobot 1.1.0__tar.gz → 1.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easterobot
-Version: 1.1.0
+Version: 1.1.1
 Summary: Discord bot for Easter.
 Project-URL: Homepage, https://github.com/Dashstrom/easterobot
 Project-URL: Repository, https://github.com/Dashstrom/easterobot

{easterobot-1.1.0 → easterobot-1.1.1}/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.1}/easterobot/commands/enable.py

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

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

@@ -150,7 +150,7 @@ async def game_dual(  # noqa: C901, D103, PLR0912
 @egg_command_group.command(
     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,

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

@@ -22,7 +22,7 @@ logger = logging.getLogger("easterobot")
 
 
 @egg_command_group.command(name="search", description="Rechercher un œuf")
-@controlled_command(cooldown=True)
+@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.1}/pyproject.toml

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

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

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