easterobot 1.1.0__py3-none-any.whl → 1.1.2__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/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/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/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/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/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/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/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/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/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/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/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.0.dist-info → easterobot-1.1.2.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ easterobot/__init__.py,sha256=jicWnRlHiIKXyAoQhL0_ga8PwMpwr_S2s33olHYoHg0,287
 easterobot/__main__.py,sha256=ix1OVjR-jxJIHzQiKyIswvn0oNphNNL9p7FtbZj9Stw,140
 easterobot/bot.py,sha256=zDijoiO-PyrIHcpypuDDx9SXNQMvIq8N1y3VvJdDbnY,6594
 easterobot/cli.py,sha256=G746r3abX-Vtcq9Ju-51FcZRj9y9PmGlIp9ADecajM4,5296
-easterobot/config.py,sha256=jlV1oMRPVek4jJTiOYkrLUcR5FEESxDNUv-IVmsPSoo,13095
+easterobot/config.py,sha256=YAtGXyu4Emk6kuoEbO0la2xuLVsWdtcJoyPn6PJ0q2w,13060
 easterobot/info.py,sha256=q7feubgPyAaMb7D90jg9lLmGv78etpOKoumdMwEI2ek,546
 easterobot/logger.py,sha256=eUUdMB0ebvb5h98WWZka2ntivBOmfHqhlvyr-82NKn4,482
 easterobot/models.py,sha256=nFxz3S0YJAa0PuhRqoKt0ZToieFlXtHygIz3vrQ370c,1785
@@ -12,26 +12,26 @@ 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/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/disable.py,sha256=Mm3ISPo_Vi9ALkJeQiZ3cTMm3D5qamfyMAGkoywZpac,974
+easterobot/commands/edit.py,sha256=jppdU6A62zhWaO_LFukbp2eTSyiL9NKyK7fBI9n1Ph8,2139
+easterobot/commands/enable.py,sha256=dIvvm7zLJ1nDbO8YaCG6C2DfAUdDb3TtbDK4pFq6VeU,1098
+easterobot/commands/game.py,sha256=-UuUZgsVhDB7C1LINlOaO4lyuUN8Zn-m2tFXFwwCqyo,6046
+easterobot/commands/help.py,sha256=hmhc7ybEOlmdtAojanQhlUyImjHJFKddKCypAYC_ZvA,1103
+easterobot/commands/reset.py,sha256=n--TDZmlRdlKDxeCKaPZGPnJ46AwS4mevP_l4haIVxM,3752
+easterobot/commands/search.py,sha256=ZV9SqC1uMD-JR5Si8_DJXWM597uoRLsWeCUeT3Irz_E,4400
 easterobot/commands/top.py,sha256=qjtRtvBKeKq228nRm_RYLY8HMrnz3n_fteBlr4WCpG0,3017
 easterobot/games/__init__.py,sha256=WHqTEE4OW1kwOZlzQslkXYMf38nDX5gT01zsgDAr80g,259
 easterobot/games/connect.py,sha256=tEwYv5nuSF_wbc4wqhizYnX5LcLwygylAskD7604kZo,6397
 easterobot/games/game.py,sha256=M5OF4hvnblmlUM1z_VdehRENl9k08eJmM0WU-65zsjg,8942
-easterobot/games/rock_paper_scissor.py,sha256=eDbdrVFuftDunvAQPU3Av41AGHmg6nwfltX8KANw1Hg,7091
-easterobot/games/tic_tac_toe.py,sha256=ob1uaC4swpoB1gOAzweuALZNmhEfocprL9GQVVdpjKk,5115
+easterobot/games/rock_paper_scissor.py,sha256=nIJySpbVQd-4gXXPFxW3cxQhNBzSgS1HiI-Pm1uTRZ0,7091
+easterobot/games/tic_tac_toe.py,sha256=vHJcrwgC0SmWOsRqPxi_wR-p3_99Tgi-fMg7J-eSKfg,5115
 easterobot/hunts/__init__.py,sha256=R0fO04m1F9kEmBy_5EzlYvWVjmY74q5adINEZGGnwCQ,258
 easterobot/hunts/hunt.py,sha256=KS6wHOdMXirPJQUPwEt7NHyngWxJfAjf0tHVujtu0k0,14844
 easterobot/hunts/rank.py,sha256=EYvyXfYqklvMflJJfcByYHhaU_NKq_D10aqOl7XuF8E,2274
 easterobot/resources/alembic.ini,sha256=SmGkhRx5iZMpjEa5avCfz1lpF0_WZPEbGA_6MSI1GjU,3297
-easterobot/resources/config.example.yml,sha256=6kUiraJZm7epWe_B2_M6Ppc08knIaPn1a-avcpOlG_4,15739
+easterobot/resources/config.example.yml,sha256=SKKh57J9OrRlsyRkLVMglr7R4WnnShfqAP6fx7gafDc,15738
 easterobot/resources/credits.txt,sha256=zJT_OmCi_PqBPQnWPvWWI9sJx6hPrXcDnNNpLRWDd20,378
 easterobot/resources/logging.conf,sha256=RSL4k79N5oQb1hEtr5SiR_IAiKjkAHZaR4DR9lOxA-M,838
 easterobot/resources/logo.png,sha256=DUFH6Tq8MjW0LGWVc4sox6RvBZCQWHZHTM2e5Ua4od4,82599
@@ -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.2.dist-info/METADATA,sha256=unwCPE-OZfIzv3X22f8cE7qAp8IrkopvX7DG9WRtqh8,7541
+easterobot-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+easterobot-1.1.2.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
+easterobot-1.1.2.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
+easterobot-1.1.2.dist-info/RECORD,,