Merge pull request #118 from iqnite/issue116

Require explicit interaction argument for game.send

Author: iqnite

eggsplode/cards/attegg.py

@@ -11,7 +11,7 @@
     from eggsplode.core import Game
 
 
-async def attegg(game: "Game", _):
+async def attegg(game: "Game", interaction: discord.Interaction):
     view = NopeView(
         game=game,
         message=format_message(
@@ -23,7 +23,7 @@ async def attegg(game: "Game", _):
         target_player_id=game.next_player_id,
         ok_callback_action=lambda _: attegg_finish(game),
     )
-    await game.send(view=view)
+    await game.send(view, interaction)
 
 
 async def attegg_finish(game: "Game", target_player_id=None, turns: int = 3):
@@ -35,7 +35,9 @@ async def attegg_finish(game: "Game", target_player_id=None, turns: int = 3):
     await game.events.turn_end()
 
 
-async def targeted_attegg_begin(game: "Game", _, target_player_id: int):
+async def targeted_attegg_begin(
+    game: "Game", interaction: discord.Interaction, target_player_id: int
+):
     view = NopeView(
         game,
         message=format_message(
@@ -47,7 +49,7 @@ async def targeted_attegg_begin(game: "Game", _, target_player_id: int):
         target_player_id=target_player_id,
         ok_callback_action=lambda _: attegg_finish(game, target_player_id),
     )
-    await game.send(view=view)
+    await game.send(view, interaction)
 
 
 async def targeted_attegg(game: "Game", interaction: discord.Interaction):

eggsplode/cards/bombs.py

@@ -29,8 +29,8 @@ def __init__(self, winner):
         )
 
 
-async def game_over(game: "Game", _):
-    await game.send(view=GameOverView(game.players[0]))
+async def game_over(game: "Game", interaction: discord.Interaction | None):
+    await game.send(GameOverView(game.players[0]), interaction)
     await game.events.game_end()
 
 
@@ -41,7 +41,7 @@ async def eggsplode(
         game.current_player_hand.remove("defuse")
         if timed_out:
             game.deck.insert(random.randint(0, len(game.deck)), "eggsplode")
-            await game.send(view=TextView("defused", game.current_player_id))
+            await game.send(TextView("defused", game.current_player_id), interaction)
             return
         view = DefuseView(
             game,
@@ -54,11 +54,12 @@ async def eggsplode(
     game.remove_player(prev_player)
     game.remaining_turns = 0
     await game.send(
-        view=TextView(
+        TextView(
             "eggsploded",
             prev_player,
             format_message("death_messages", random_from_list=True),
-        )
+        ),
+        interaction,
     )
     if len(game.players) == 1:
         await game_over(game, interaction)
@@ -68,12 +69,12 @@ async def eggsplode(
 
 
 async def defuse_finish(game: "Game"):
-    await game.send(view=TextView("defused", game.current_player_id))
+    await game.send(TextView("defused", game.current_player_id), None)
     await game.events.turn_end()
 
 
 async def radioeggtive_finish(game: "Game"):
-    await game.send(view=TextView("radioeggtive", game.current_player_id))
+    await game.send(TextView("radioeggtive", game.current_player_id), None)
     await game.events.turn_end()
 
 
@@ -82,7 +83,7 @@ async def radioeggtive(
 ):
     if timed_out:
         game.deck.insert(random.randint(0, len(game.deck)), "radioeggtive_face_up")
-        await game.send(view=TextView("radioeggtive", game.current_player_id))
+        await game.send(TextView("radioeggtive", game.current_player_id), interaction)
     else:
         view = DefuseView(
             game,
@@ -100,11 +101,12 @@ async def radioeggtive_face_up(
     game.remove_player(prev_player)
     game.remaining_turns = 0
     await game.send(
-        view=TextView(
+        TextView(
             "radioeggtive_face_up",
             prev_player,
             format_message("death_messages", random_from_list=True),
-        )
+        ),
+        interaction,
     )
     if len(game.players) == 1:
         await game_over(game, interaction)
@@ -113,30 +115,37 @@ async def radioeggtive_face_up(
         await game.events.turn_end()
 
 
-async def eggsperiment_finish(game: "Game", _, target_player_id: int, pair=False):
+async def eggsperiment_finish(
+    game: "Game",
+    interaction: discord.Interaction | None,
+    target_player_id: int,
+    pair=False,
+):
     if "defuse" in game.hands[target_player_id]:
         game.hands[target_player_id].remove("defuse")
         await game.send(
-            view=TextView(
+            TextView(
                 "eggsperiment_pair_defused" if pair else "eggsperiment_defused",
                 game.current_player_id,
                 target_player_id,
             ),
+            interaction,
         )
     else:
         await game.send(
-            view=TextView(
+            TextView(
                 "eggsperiment_pair_eggsploded" if pair else "eggsperiment_eggsploded",
                 game.current_player_id,
                 target_player_id,
                 format_message("death_messages", random_from_list=True),
             ),
+            interaction,
         )
         del game.players[game.players.index(target_player_id)]
         del game.hands[target_player_id]
         game.current_player = game.players.index(game.current_player_id)
         if len(game.players) == 1:
-            await game_over(game, _)
+            await game_over(game, interaction)
             return
     await game.events.action_end()
 
@@ -160,5 +169,5 @@ async def eggsperiment(game: "Game", interaction: discord.Interaction):
         await eggsperiment_finish(game, interaction, players_with_eggsperiment[0])
         return
     game.current_player_hand.append("eggsperiment")
-    await game.send(view=TextView("eggsperiment_exposed", game.current_player_id))
+    await game.send(TextView("eggsperiment_exposed", game.current_player_id), interaction)
     await game.events.action_end()

eggsplode/cards/deck.py

@@ -11,9 +11,9 @@
     from eggsplode.core import Game
 
 
-async def shuffle(game: "Game", _):
+async def shuffle(game: "Game", interaction: discord.Interaction):
     game.shuffle_deck()
-    await game.send(view=TextView("shuffled", game.current_player_id))
+    await game.send(TextView("shuffled", game.current_player_id), interaction)
     await game.events.action_end()
 
 
@@ -26,7 +26,7 @@ async def swap_top_bottom(game: "Game", interaction: discord.Interaction):
         await game.events.action_end()
         return
     game.deck[-1], game.deck[0] = game.deck[0], game.deck[-1]
-    await game.send(view=TextView("swapped_top_bottom", game.current_player_id))
+    await game.send(TextView("swapped_top_bottom", game.current_player_id), interaction)
     await game.events.action_end()
 
 

eggsplode/cards/future.py

@@ -12,7 +12,7 @@
 
 
 async def see_future(game: "Game", interaction: discord.Interaction):
-    await game.send(view=TextView("predicted", game.current_player_id))
+    await game.send(TextView("predicted", game.current_player_id), interaction)
     await show_next_cards(interaction, game.deck)
     await game.events.action_end()
 
@@ -34,8 +34,8 @@ async def show_next_cards(
     )
 
 
-async def alter_future_finish(game: "Game", _):
-    await game.send(view=TextView("altered_future", game.action_player_id))
+async def alter_future_finish(game: "Game", interaction: discord.Interaction | None):
+    await game.send(TextView("altered_future", game.action_player_id), interaction)
     await game.events.action_end()
 
 
@@ -135,11 +135,12 @@ async def view_cards(self, interaction: discord.Interaction):
 
 async def share_future_finish(game: "Game"):
     await game.send(
-        view=ShareFutureView(
+        ShareFutureView(
             game.deck.copy(),
             game.current_player_id,
             game.next_player_id,
-        )
+        ),
+        None,
     )
     await game.events.action_end()
 

eggsplode/cards/skip.py

@@ -11,8 +11,10 @@
     from eggsplode.core import Game
 
 
-async def skip(game: "Game", _):
-    await game.send(view=TextView("skipped", game.current_player_id))
+async def skip(game: "Game", interaction: discord.Interaction):
+    await game.send(
+        view=TextView("skipped", game.current_player_id), interaction=interaction
+    )
     await game.events.turn_end()
 
 
@@ -22,26 +24,30 @@ async def draw_from_bottom(game: "Game", interaction: discord.Interaction):
         await game.events.turn_end()
 
 
-async def reverse(game: "Game", _):
+async def reverse(game: "Game", interaction: discord.Interaction):
     game.reverse()
-    await game.send(view=TextView("reversed", game.current_player_id))
+    await game.send(
+        view=TextView("reversed", game.current_player_id), interaction=interaction
+    )
     await game.events.turn_end()
 
 
-async def super_skip(game: "Game", _):
+async def super_skip(game: "Game", interaction: discord.Interaction):
     game.remaining_turns = 0
-    await skip(game, _)
+    await skip(game, interaction)
 
 
-async def bury_finish(game: "Game"):
-    await game.send(view=TextView("buried", game.current_player_id))
+async def bury_finish(game: "Game", interaction: discord.Interaction):
+    await game.send(
+        view=TextView("buried", game.current_player_id), interaction=interaction
+    )
     await game.events.turn_end()
 
 
 async def bury(game: "Game", interaction: discord.Interaction):
     view = DefuseView(
         game,
-        lambda: bury_finish(game),
+        lambda: bury_finish(game, interaction),
         card=game.deck.pop(),
     )
     await interaction.respond(view=view, ephemeral=True)
@@ -77,9 +83,9 @@ def __init__(self, game: "Game"):
 
     async def finish(self, interaction: discord.Interaction | None = None):
         if not interaction:
-            interaction = self.game.anchor_interaction
+            interaction = self.game.last_interaction
             if not interaction:
-                raise ValueError("No anchor interaction set for the game.")
+                raise ValueError("No last interaction set for the game.")
         _, hold = await self.game.draw_from(interaction)
         self.stop()
         if hold:
@@ -89,7 +95,10 @@ async def dig_deeper(self, interaction: discord.Interaction):
         self.stop()
         self.disable_all_items()
         await interaction.edit(view=self)
-        await self.game.send(view=TextView("dug_deeper", self.game.current_player_id))
+        await self.game.send(
+            view=TextView("dug_deeper", self.game.current_player_id),
+            interaction=interaction,
+        )
         _, hold = await self.game.draw_from(interaction, index=-2)
         if hold:
             await self.game.events.turn_end()
@@ -103,5 +112,5 @@ async def dig_deeper(game: "Game", interaction: discord.Interaction):
         game.current_player_hand.append("dig_deeper")
         await game.events.action_end()
         return
-    game.anchor_interaction = interaction
+    game.last_interaction = interaction
     await interaction.respond(view=DigDeeperView(game), ephemeral=True)

eggsplode/cards/steal.py

@@ -21,15 +21,17 @@ async def food_combo_finish(
     target_hand = game.hands[target_player_id]
     if not target_hand:
         await game.send(
-            view=TextView("no_cards_to_steal", game.current_player_id, target_player_id)
+            TextView("no_cards_to_steal", game.current_player_id, target_player_id),
+            interaction,
         )
         await game.events.action_end()
         return
     stolen_card = random.choice(target_hand)
     game.hands[target_player_id].remove(stolen_card)
     game.current_player_hand.append(stolen_card)
     await game.send(
-        view=TextView("stolen_card_public", game.current_player_id, target_player_id)
+        TextView("stolen_card_public", game.current_player_id, target_player_id),
+        interaction,
     )
     try:
         await interaction.respond(
@@ -71,7 +73,7 @@ async def food_combo_begin(
             game, interaction, target_interaction, target_player_id
         ),
     )
-    await game.send(view=view)
+    await game.send(view, interaction)
 
 
 async def food_combo(game: "Game", interaction: discord.Interaction, card: str):

eggsplode/cogs/eggsplode_game.py

@@ -125,7 +125,7 @@ async def play_card(self, ctx: discord.ApplicationContext, card: str | None = No
                     ephemeral=True,
                 )
                 return
-            game.anchor_interaction = ctx.interaction
+            game.last_interaction = ctx.interaction
             await game.play_callback(ctx.interaction, card)
         else:
             await game.show_hand(ctx.interaction)

eggsplode/commands.py

@@ -114,7 +114,7 @@ async def create_game(self, interaction: discord.Interaction, config=None):
             ),
             game_id=game_id,
         )
-        game.anchor_interaction = interaction
+        game.last_interaction = interaction
         self.logger.info("Game %s: Created.", game_id)
         view = StartGameView(game)
         await interaction.respond(view=view)