easterobot 1.5.1__py3-none-any.whl → 1.5.2__py3-none-any.whl

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/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
 

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/info.py

@@ -1,18 +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 "Author" in _METADATA:
-    __author__ = str(_METADATA["Author"])
-    __email__ = str(_METADATA["Author-email"])
+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:
-    __author__, __email__ = _METADATA["Author-email"][:-1].split(" <", 1)
-__version__ = _METADATA["Version"]
-__summary__ = _METADATA["Summary"]
+    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.dist-info → easterobot-1.5.2.dist-info}/METADATA

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

@@ -3,7 +3,7 @@ easterobot/__main__.py,sha256=ix1OVjR-jxJIHzQiKyIswvn0oNphNNL9p7FtbZj9Stw,140
 easterobot/bot.py,sha256=SQjTfMntWDIB8_qxbAksGEFbTdraaWxsSPRzOOUZy3Q,7373
 easterobot/cli.py,sha256=G746r3abX-Vtcq9Ju-51FcZRj9y9PmGlIp9ADecajM4,5296
 easterobot/config.py,sha256=TcGaTZi70mGRy4iiHiQ5kNyPBdFEV2uf-2wTYXKGwhU,15719
-easterobot/info.py,sha256=q7feubgPyAaMb7D90jg9lLmGv78etpOKoumdMwEI2ek,546
+easterobot/info.py,sha256=9Uabt6ci1mQUoBcO1W0gB0HjDBnTEC1sO1227xyCBtQ,837
 easterobot/locker.py,sha256=LU5pj7lvYzkFfvl00T-lq9DQwKKZu4ETxv00TNHlgCM,5322
 easterobot/logger.py,sha256=eUUdMB0ebvb5h98WWZka2ntivBOmfHqhlvyr-82NKn4,482
 easterobot/models.py,sha256=HgSqDiPqJ3PsrHR4o9LQxBuvaSKvauf2dVXO-gjyDWs,2029
@@ -22,7 +22,7 @@ easterobot/commands/basket.py,sha256=sV6JfPxg4U98dTTA5tr1wnMVM5DI9UXGL6FWL9OphTw
 easterobot/commands/disable.py,sha256=AMSUBIdS6H8PMv2iYJIOMPuciEUtrTVUWe9bAJ6m1yA,975
 easterobot/commands/edit.py,sha256=jppdU6A62zhWaO_LFukbp2eTSyiL9NKyK7fBI9n1Ph8,2139
 easterobot/commands/enable.py,sha256=MtvNFzQWjxB9QoHq2YF4j_KTLPnAVDayflUPemQGNuQ,1099
-easterobot/commands/game.py,sha256=8hsvAPf3a2AA32Onfk4y-6PogB5GM3qUsABUPMCLESU,6275
+easterobot/commands/game.py,sha256=UTovNVs6pmq8on4VR8V3cYIqM5uwsNDuqetd05egnw4,6428
 easterobot/commands/help.py,sha256=FWYSkmYvFzrGKBV7I-qu6J4EYXjRjFCJvDa5F48OaEU,1133
 easterobot/commands/info.py,sha256=mh2vStpkRbuwwvV7PxPv0nhSMI-AP58c_cMvDa8ohW8,1812
 easterobot/commands/reset.py,sha256=ArWCJvRHOOH7KNQymcfkeFuRxzVz-YMn0-c29ycGaMQ,3651
@@ -31,9 +31,9 @@ easterobot/commands/search.py,sha256=rgpqkcYutp0UgW_BN77YxdUg5zqWrQ4RRbBt4V49wo4
 easterobot/commands/top.py,sha256=-wlshgpPBtxBOJe1Ltmds_siQ0EhJCl3C2QMldpfs0o,3040
 easterobot/games/__init__.py,sha256=WHqTEE4OW1kwOZlzQslkXYMf38nDX5gT01zsgDAr80g,259
 easterobot/games/connect4.py,sha256=uF1Q1RLf18Ml0yeXjtX4WeepQJOVtMiuUgkDF5xB3XY,6315
-easterobot/games/game.py,sha256=qbFtpkrfnJCaql0bElaWAPkPCKEECPzTlCP-pUb2caU,14160
+easterobot/games/game.py,sha256=1nFTFV5U9BXEUw7MwhgoXVGYLyiN7uAyEL1RLm2aN30,14160
 easterobot/games/rock_paper_scissor.py,sha256=QZOgXrjs0Di2cqSRZxgbFFGmxHTTMFb3Fi59kJikA7c,7832
-easterobot/games/skyjo.py,sha256=52a-AgBSbU55n2J3aTrCKK5ptmnWdqL7JTY3lAZ91aQ,27322
+easterobot/games/skyjo.py,sha256=g1123i-KQ3XeAvSX0eeEF-ydq5YpFDSNJpKOUgZ597I,27321
 easterobot/games/tic_tac_toe.py,sha256=okfxhZeUEUyXCG60jo-Qfd7a4nWRLbZ0p7OoJBTzxvw,5165
 easterobot/hunts/__init__.py,sha256=R0fO04m1F9kEmBy_5EzlYvWVjmY74q5adINEZGGnwCQ,258
 easterobot/hunts/hunt.py,sha256=_X55JCWAQi76nvxZ-Wv-i7SBsDrj7mIZX2c-ijilhOc,18915
@@ -123,8 +123,8 @@ easterobot/resources/emotes/skyjo/skyjo_p6.png,sha256=gSQug3mYmCiH49LYIBwucrBP_S
 easterobot/resources/emotes/skyjo/skyjo_p7.png,sha256=HZCc1mWxGS-BNTqSPkFQlNVX5AzH5P9HNX55Wzq1sm0,489
 easterobot/resources/emotes/skyjo/skyjo_p8.png,sha256=7tbzRNmbsSEc0CkmwxdXxASPCydao1ThKTU-FWB2HE8,708
 easterobot/resources/emotes/skyjo/skyjo_p9.png,sha256=a7x8fL60meKbAIad8YCiuxduum6OwiXceoC3Tq9wLWo,522
-easterobot-1.5.1.dist-info/METADATA,sha256=kT3gl_Icu_rwgeIQoF-GC9GB9BY8mVXydm8YathibiE,7787
-easterobot-1.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-easterobot-1.5.1.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
-easterobot-1.5.1.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
-easterobot-1.5.1.dist-info/RECORD,,
+easterobot-1.5.2.dist-info/METADATA,sha256=UxC5WvfKWICMlDDLyN0ClNV6uyPsmt1Bb774kEmYr_w,8099
+easterobot-1.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+easterobot-1.5.2.dist-info/entry_points.txt,sha256=KaH17cNnu7qbWxFcMaj1wZ9GPTjWJ1OTqkBMhoLOmCQ,57
+easterobot-1.5.2.dist-info/licenses/LICENSE,sha256=kYRz570GVPktzhJxWtaencsrsjdKSetpe5WISlDrvnY,1093
+easterobot-1.5.2.dist-info/RECORD,,