easterobot 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

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/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/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/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.dist-info → easterobot-1.1.1.dist-info}/METADATA

@@ -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.dist-info → easterobot-1.1.1.dist-info}/RECORD

@@ -12,15 +12,15 @@ easterobot/alembic/script.py.mako,sha256=3qBrHBf7F7ChKDUIdiNItiSXrDpgQdM7sR0YKzp
 easterobot/alembic/versions/2f0d4305e320_init_database.py,sha256=Y8pkYG_8i3jymbTxg5ANaaShpadPo5J2TUp2ZSKxffM,2245
 easterobot/alembic/versions/940c3b9c702d_add_lock_on_eggs.py,sha256=lGGjeXzrHgRAP-i4kfMh6841EcOr3y8D1PRWaMV7ozA,943
 easterobot/commands/__init__.py,sha256=vzVx4DrveAKl4c71VRMvQjzrWzuWmayAkd0f4k7JNt4,1026
-easterobot/commands/base.py,sha256=j2OdmwnSphkDJUNF6ArNn3I8BqwK4Sn7IuCDDtH1yFw,5906
+easterobot/commands/base.py,sha256=_P6xsre6gDdS4h2-DXfhpLBgYW774eHOSc0p6iLv7iY,7054
 easterobot/commands/basket.py,sha256=sV6JfPxg4U98dTTA5tr1wnMVM5DI9UXGL6FWL9OphTw,2924
 easterobot/commands/disable.py,sha256=qjgLRQZUXK9toq-vJdE6qOYX5Pxb9wjIyvWrKJ22GAo,970
 easterobot/commands/edit.py,sha256=QfQJoLKl3ox6evA4D_Bt8BMqT_M5w5b7z7-Rk9JXIK8,2134
-easterobot/commands/enable.py,sha256=IRIwIHgZS3kz60CCfQBR8sBRs25CEyvxYewsTW--TrI,1034
-easterobot/commands/game.py,sha256=5idVI7WOsBlYCWXYGPtwRC6rVX5PuaKrIoqrvhFFWTs,5996
+easterobot/commands/enable.py,sha256=bgoXg7vVThmbJBt4Q2H9R-gWGBmyjWbu18xl_-gcTI8,1094
+easterobot/commands/game.py,sha256=q1C34Grd_rNt6YfbTp-bU2HcdvQRX3mMiBRc2aytrTY,6041
 easterobot/commands/help.py,sha256=KquNRRgUStMuu4w26icYgSF4K-HJNLl96ZNbEg3as3U,1082
 easterobot/commands/reset.py,sha256=B_dTUawmXWBgbJkAyYYkyw_QjAvqvPoGTXLzUtLFPAc,3748
-easterobot/commands/search.py,sha256=WE7w18vPNDlWgpoj-RIZZZqGBMLjvQoygex79iPFZJU,4345
+easterobot/commands/search.py,sha256=7rQGL7d7ftKqXvJdRPEpZeUcF72lf_b15vtXQkI3igM,4390
 easterobot/commands/top.py,sha256=qjtRtvBKeKq228nRm_RYLY8HMrnz3n_fteBlr4WCpG0,3017
 easterobot/games/__init__.py,sha256=WHqTEE4OW1kwOZlzQslkXYMf38nDX5gT01zsgDAr80g,259
 easterobot/games/connect.py,sha256=tEwYv5nuSF_wbc4wqhizYnX5LcLwygylAskD7604kZo,6397
@@ -59,8 +59,8 @@ easterobot/resources/emotes/icons/arrow.png,sha256=ZkAicY2AONJUQRTdvkG77wPO5EYE9
 easterobot/resources/emotes/icons/end.png,sha256=8jkufw0aS99tyZCb80PUzT2mkipQrYxwuFOFmOH6UNk,24526
 easterobot/resources/emotes/icons/versus.png,sha256=Ss9PZu4nENB7xo8Kdunt0STvCSrMbo-bTaYz-NJ8tfI,29212
 easterobot/resources/emotes/icons/wait.png,sha256=xXK6bKtPpD1f5wSjMGqzuPzVdV4gkOgMSJ_fVjuzJp4,20378
-easterobot-1.1.0.dist-info/METADATA,sha256=SAZsbRjw-Akcp2ypf7U9pVkW9FquARz7cjUAbBNxBfY,7467
-easterobot-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-easterobot-1.1.0.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
-easterobot-1.1.0.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
-easterobot-1.1.0.dist-info/RECORD,,
+easterobot-1.1.1.dist-info/METADATA,sha256=wHgO2um5ocgHwFIOFA4lqQmZhu_JJpwrrm_P4BiAwx8,7467
+easterobot-1.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+easterobot-1.1.1.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
+easterobot-1.1.1.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
+easterobot-1.1.1.dist-info/RECORD,,