easterobot 1.5.1__tar.gz → 1.5.2__tar.gz

{easterobot-1.5.1 → easterobot-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easterobot
-Version: 1.5.1
+Version: 1.5.2
 Summary: Discord bot for Easter.
 Project-URL: Homepage, https://github.com/Dashstrom/easterobot
 Project-URL: Repository, https://github.com/Dashstrom/easterobot
@@ -144,24 +144,28 @@ Configuration directory
 
 ..  code-block:: text
 
-  data                        Root directory
-  ├── .gitignore              Avoid pushing sensitive data
-  ├── config.yml              Configuration file
-  ├── easterobot.db           Database
-  ├── logs                    Logging directory
-  │   ├── easterobot.log      Latest log file
-  │   └── easterobot.log.1    Rotating log file
-  └── resources               Resource directory
-      ├── config.example.yml  An example of config
-      ├── credits.txt         Credits of emotes
-      ├── emotes              Directory loaded as application emotes
-      │   ├── eggs            Directory for eggs
-      │   |   └── egg_01.png  Emoji to use for egg
-      │   └── icons           Misc emotes to load
-      │       └── arrow.png   Emoji used in messages
-      ├── logging.conf        Logging configuration
-      ├── alembic.ini         Configure for alembic
-      └── logo.png            Logo used by the bot
+  data                          Root directory
+  ├── .gitignore                Avoid pushing sensitive data
+  ├── config.yml                Configuration file
+  ├── easterobot.db             Database
+  ├── logs                      Logging directory
+  │   ├── easterobot.log        Latest log file
+  │   └── easterobot.log.1      Rotating log file
+  └── resources                 Resource directory
+      ├── config.example.yml    An example of config
+      ├── credits.txt           Credits of emotes
+      ├── emotes                Directory loaded as application emotes
+      │   ├── eggs              Directory for eggs
+      │   |   └── egg_01.png    Emoji to use for egg
+      │   ├── icons             Misc emotes to load
+      │   │   └── arrow.png     Emoji used in messages
+      │   ├── placements        Directory for emoji used in grid
+      │   │   └── s1.png        Single blue emoji with one on it
+      │   └── skyjo             Skyjo cards
+      │       └── skyjo_m1.png  Card with minus -1 with deep blue
+      ├── logging.conf          Logging configuration
+      ├── alembic.ini           Configure for alembic
+      └── logo.png              Logo used by the bot
 
 Development
 ###########

{easterobot-1.5.1 → easterobot-1.5.2}/README.rst

@@ -106,24 +106,28 @@ Configuration directory
 
 ..  code-block:: text
 
-  data                        Root directory
-  ├── .gitignore              Avoid pushing sensitive data
-  ├── config.yml              Configuration file
-  ├── easterobot.db           Database
-  ├── logs                    Logging directory
-  │   ├── easterobot.log      Latest log file
-  │   └── easterobot.log.1    Rotating log file
-  └── resources               Resource directory
-      ├── config.example.yml  An example of config
-      ├── credits.txt         Credits of emotes
-      ├── emotes              Directory loaded as application emotes
-      │   ├── eggs            Directory for eggs
-      │   |   └── egg_01.png  Emoji to use for egg
-      │   └── icons           Misc emotes to load
-      │       └── arrow.png   Emoji used in messages
-      ├── logging.conf        Logging configuration
-      ├── alembic.ini         Configure for alembic
-      └── logo.png            Logo used by the bot
+  data                          Root directory
+  ├── .gitignore                Avoid pushing sensitive data
+  ├── config.yml                Configuration file
+  ├── easterobot.db             Database
+  ├── logs                      Logging directory
+  │   ├── easterobot.log        Latest log file
+  │   └── easterobot.log.1      Rotating log file
+  └── resources                 Resource directory
+      ├── config.example.yml    An example of config
+      ├── credits.txt           Credits of emotes
+      ├── emotes                Directory loaded as application emotes
+      │   ├── eggs              Directory for eggs
+      │   |   └── egg_01.png    Emoji to use for egg
+      │   ├── icons             Misc emotes to load
+      │   │   └── arrow.png     Emoji used in messages
+      │   ├── placements        Directory for emoji used in grid
+      │   │   └── s1.png        Single blue emoji with one on it
+      │   └── skyjo             Skyjo cards
+      │       └── skyjo_m1.png  Card with minus -1 with deep blue
+      ├── logging.conf          Logging configuration
+      ├── alembic.ini           Configure for alembic
+      └── logo.png              Logo used by the bot
 
 Development
 ###########

{easterobot-1.5.1 → easterobot-1.5.2}/easterobot/commands/game.py

@@ -1,6 +1,7 @@
 """Module for disable hunt."""
 
 import asyncio
+from contextlib import suppress
 from typing import Optional
 
 import discord
@@ -54,15 +55,18 @@ async def game_dual(  # noqa: D103
     cls: type[Game],
     *members: discord.Member,
 ) -> None:
+    set_members = set(members)
+    with suppress(KeyError):
+        set_members.remove(ctx.user)
     min_player = cls.minimum_player()
     max_player = cls.maximum_player()
-    if min_player > len(members) + 1:
+    if min_player > len(set_members) + 1:
         await ctx.response.send_message(
             f"Vous devez être au minimum {min_player} joueurs",
             ephemeral=True,
         )
         return
-    if max_player < len(members) + 1:
+    if max_player < len(set_members) + 1:
         await ctx.response.send_message(
             f"Vous devez être au maximum {min_player} joueurs",
             ephemeral=True,
@@ -77,13 +81,13 @@ async def game_dual(  # noqa: D103
         locker = EggLocker(session, ctx.guild.id)
         try:
             await locker.pre_check(
-                {ctx.user: bet, **{m: bet for m in members}}
+                {ctx.user: bet, **{m: bet for m in set_members}}
             )
         except EggLockerError as err:
             await ctx.response.send_message(str(err), ephemeral=True)
             return
 
-        msg = await ctx.client.game.ask_dual(ctx, members, bet=bet)
+        msg = await ctx.client.game.ask_dual(ctx, set_members, bet=bet)
         if msg:
             # Unlock all egg at end
             async with locker:
@@ -92,13 +96,13 @@ async def game_dual(  # noqa: D103
                     async with locker.transaction():
                         all_eggs = await asyncio.gather(
                             locker.get(ctx.user, bet),
-                            *[locker.get(m, bet) for m in members],
+                            *[locker.get(m, bet) for m in set_members],
                         )
                 except EggLockerError as err:
                     await msg.reply(str(err), delete_after=30)
                     return
 
-                players = [ctx.user, *members]
+                players = [ctx.user, *set_members]
                 RAND.shuffle(players)
                 game = cls(ctx.client, msg, *players)
                 await ctx.client.game.run(game)

{easterobot-1.5.1 → easterobot-1.5.2}/easterobot/games/skyjo.py

@@ -785,13 +785,13 @@ class Skyjo(Game):
         """Get all score."""
         scores = {}
         for p, grid in self.grids.items():
-            scores[p] = grid.value
             grid.return_all_card()
+            scores[p] = grid.value
         finish_player = self.finish_player
         if finish_player:
             finish_score = scores[finish_player]
             for p, value in scores.items():
-                if p != finish_player and value <= finish_score:
+                if p != finish_player and value < finish_score:
                     scores[finish_player] *= 2
                 break
         return scores

easterobot-1.5.2/easterobot/info.py

@@ -0,0 +1,28 @@
+"""Module holding metadata."""
+
+import logging
+from importlib.metadata import Distribution
+
+logger = logging.getLogger(__name__)
+_DISTRIBUTION = Distribution.from_name(
+    "easterobot",
+)
+_METADATA = _DISTRIBUTION.metadata
+if len(_METADATA) != 0:
+    if "Author" in _METADATA:
+        __author__ = str(_METADATA["Author"])
+        __email__ = str(_METADATA["Author-email"])
+    else:
+        __author__, __email__ = _METADATA["Author-email"][:-1].split(" <", 1)
+    __version__ = _METADATA["Version"]
+    __summary__ = _METADATA["Summary"]
+else:
+    logger.warning("Cannot load package metadata, please reinstall !")
+
+    __author__ = "Unknown"
+    __email__ = "Unknown"
+    __version__ = "Unknown"
+    __summary__ = "Unknown"
+
+__copyright__ = f"{__author__} <{__email__}>"
+__issues__ = "https://github.com/Dashstrom/easterobot/issues"

{easterobot-1.5.1 → easterobot-1.5.2}/pyproject.toml

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

{easterobot-1.5.1 → easterobot-1.5.2}/uv.lock

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

easterobot-1.5.1/easterobot/info.py

@@ -1,18 +0,0 @@
-"""Module holding metadata."""
-
-from importlib.metadata import Distribution
-
-_DISTRIBUTION = Distribution.from_name(
-    "easterobot",
-)
-_METADATA = _DISTRIBUTION.metadata
-
-if "Author" in _METADATA:
-    __author__ = str(_METADATA["Author"])
-    __email__ = str(_METADATA["Author-email"])
-else:
-    __author__, __email__ = _METADATA["Author-email"][:-1].split(" <", 1)
-__version__ = _METADATA["Version"]
-__summary__ = _METADATA["Summary"]
-__copyright__ = f"{__author__} <{__email__}>"
-__issues__ = "https://github.com/Dashstrom/easterobot/issues"

{easterobot-1.5.1 → easterobot-1.5.2}/easterobot/games/game.py

@@ -247,8 +247,8 @@ class GameCog(commands.Cog):
         bet: int,
     ) -> Optional[discord.Message]:
         """Send basic message for initialization."""
-        event = asyncio.Event()
         pending_members = list(members)
+        event = asyncio.Event()
         accepted_members: list[discord.Member] = [ctx.user]
         cancel_by: Optional[discord.Member] = None