Merge pull request CSS360-2026-Winter#167 from rdum4/lobby-timeout

Lobby timeout

Author: D1Adamm

controllers/uno_cog.py

@@ -40,6 +40,9 @@ def __init__(self, bot: commands.Bot):
         # Initialize renderer
         self._renderer = Renderer(self.lobby_service, self.game_service)
 
+        # Solo timer
+        self._solo_lobby_timers: dict[int, asyncio.Task] = {}
+
     @app_commands.command(name="create", description="Create a lobby in this channel.")
     async def create(self, interaction: discord.Interaction) -> None:
         """
@@ -69,6 +72,9 @@ async def create(self, interaction: discord.Interaction) -> None:
             # Silently fail if we can't ping.
             pass
 
+        lobby.channel_id = cid
+        asyncio.create_task(self.start_solo_lobby_timer(lobby))
+
     @app_commands.command(
         name="play",
         description="Play a card from your hand on your turn (index starts at 0).",
@@ -184,7 +190,7 @@ async def kick(self, interaction: discord.Interaction, player: discord.Member):
                     title="Player Not Found",
                 )
 
-            self._kick_player(lobby, player.id)
+            await self._kick_player(lobby, player.id, channel_id=cid)
 
         except GameError as e:
             embed = self._renderer.lobby_views.error_embed(
@@ -206,9 +212,8 @@ async def _kick_player(
         Helper to remove a player from the game.
         afk=True changes messages to AFK-specific ones
         """
-        cid = channel_id
+        cid = channel_id if channel_id is not None else lobby.channel_id
         game = lobby.game
-        channel = self.bot.get_channel(cid)
 
         try:
             game.kick_player(player_id)
@@ -338,6 +343,88 @@ def start_afk_timer(self, channel_id: int, lobby) -> None:
             self.run_afk_timer(channel_id, game.current_player(), game.turn_count())
         )
 
+    async def start_solo_lobby_timer(self, lobby):
+        """
+        Starts a solo lobby timer for a lobby with only one player.
+        Sends a separate countdown embed. Replaces it with a "Lobby expired" embed
+        when timer ends and deletes the main lobby embed.
+        """
+        channel = self.bot.get_channel(lobby.channel_id)
+        if channel is None or not getattr(lobby, "main_message", None):
+            return
+
+        timer_embed = discord.Embed(
+            title="⏳ Solo Lobby Timer",
+            description="Lobby expires in **120** seconds if nobody joins.",
+            color=discord.Color.orange(),
+        )
+
+        try:
+            timer_msg = await channel.send(embed=timer_embed)
+        except discord.HTTPException:
+            return
+
+        total_sec = 120
+        interval = 1
+
+        try:
+            while total_sec > 0:
+                if len(lobby.game.players()) > 1:
+                    await timer_msg.delete()
+                    return
+
+                minutes, seconds = divmod(total_sec, 60)
+                timer_embed.description = (
+                    f"Lobby expires in **{minutes}:{seconds:02d}** if nobody joins."
+                )
+
+                try:
+                    await timer_msg.edit(embed=timer_embed)
+                except discord.HTTPException:
+                    pass
+
+                await asyncio.sleep(interval)
+                total_sec -= interval
+
+            self.lobby_service.disband_lobby(lobby.channel_id, lobby.user)
+
+            timer_embed.title = "🕒 Lobby Expired"
+            timer_embed.description = "The solo lobby has expired due to inactivity."
+            try:
+                await timer_msg.edit(embed=timer_embed)
+            except discord.HTTPException:
+                pass
+
+            try:
+                main_msg = await channel.fetch_message(lobby.main_message)
+                await main_msg.delete()
+            except (discord.NotFound, discord.HTTPException):
+                pass
+
+        except asyncio.CancelledError:
+            try:
+                await timer_msg.delete()
+            except discord.HTTPException:
+                pass
+
+        except (discord.HTTPException, discord.Forbidden, GameError) as e:
+            print(f"Solo lobby timer error: {e}")
+
+    def restart_solo_lobby_timer(self, lobby):
+        """
+        Starts the solo timer if there's 1 player, cancels it otherwise.
+        """
+        cid = lobby.channel_id
+
+        task = self._solo_lobby_timers.get(cid)
+        if task and not task.done():
+            task.cancel()
+
+        if len(lobby.game.players()) == 1:
+            self._solo_lobby_timers[cid] = asyncio.create_task(
+                self.start_solo_lobby_timer(lobby)
+            )
+
 
 async def setup(bot: commands.Bot) -> None:
     """

ui/lobby_ui.py

@@ -78,6 +78,11 @@ async def leave(
             return
 
         lobby = self.lobby_service.get_lobby(cid)
+
+        cog = interaction.client.get_cog("UnoCog")
+        if cog:
+            cog.restart_solo_lobby_timer(lobby)
+
         await self._renderer.update_from_interaction(interaction, lobby)
 
     @discord.ui.button(label="🚀 Start Game", style=discord.ButtonStyle.success)