Merge pull request #13 from TheCodeVerseHub/yc45

Hardened the send helper so if an interaction still expires

Author: youngcoder45

src/cogs/leveling.py

@@ -45,15 +45,49 @@ async def cog_unload(self):
             logger.exception("Failed to close RankCardGenerator")
 
     async def _send(self, ctx: commands.Context, *args, **kwargs):
-        """Send helper that avoids passing interaction-only kwargs in prefix mode."""
-        if getattr(ctx, "interaction", None) is None:
+        """Send helper that works for both prefix and interaction invocations.
+
+        For interactions, responses must be sent within ~3s unless deferred.
+        If an interaction has expired (error 10062), we fall back to a normal
+        channel message as a last resort.
+        """
+        interaction = getattr(ctx, "interaction", None)
+
+        if interaction is None:
             kwargs.pop("ephemeral", None)
-        return await ctx.send(*args, **kwargs)
 
-    async def _maybe_defer(self, ctx: commands.Context):
-        """Defer only when invoked as a slash command."""
-        if getattr(ctx, "interaction", None) is not None:
-            await ctx.defer()
+        try:
+            return await ctx.send(*args, **kwargs)
+        except discord.NotFound as e:
+            # Slash interaction expired/invalid (common if not deferred quickly).
+            # Fall back to a plain channel send (cannot be ephemeral).
+            if interaction is not None and getattr(e, "code", None) == 10062 and getattr(ctx, "channel", None) is not None:
+                kwargs.pop("ephemeral", None)
+                return await ctx.channel.send(*args, **kwargs)  # type: ignore[union-attr]
+            raise
+        except discord.InteractionResponded:
+            # If something already responded via interaction, use follow-up.
+            if interaction is not None:
+                return await interaction.followup.send(*args, **kwargs)
+            raise
+
+    async def _maybe_defer(self, ctx: commands.Context, *, ephemeral: bool = False):
+        """Defer only when invoked as a slash command and not already acknowledged."""
+        interaction = getattr(ctx, "interaction", None)
+        if interaction is None:
+            return
+
+        # Avoid double-acknowledging the interaction.
+        if interaction.response.is_done():
+            return
+
+        try:
+            await ctx.defer(ephemeral=ephemeral)
+        except discord.NotFound:
+            # Interaction already expired; caller should rely on _send() fallback.
+            return
+        except discord.HTTPException:
+            return
 
     # ========================================================================
     # Leveling Formula
@@ -307,6 +341,8 @@ async def leaderboard(self, ctx: commands.Context, page: int = 1):
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         if page < 1:
             page = 1
 
@@ -364,6 +400,8 @@ async def xp(self, ctx: commands.Context, user: Optional[discord.Member] = None)
         if target.bot:
             await self._send(ctx, "Bots don't have XP!", ephemeral=True)
             return
+
+        await self._maybe_defer(ctx)
 
         user_data = await db.get_user_data(target.id, ctx.guild.id)
 
@@ -414,6 +452,8 @@ async def setlevel(self, ctx: commands.Context, user: discord.Member, level: int
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         if level < 0:
             await self._send(ctx, " Level must be 0 or higher!", ephemeral=True)
             return
@@ -445,6 +485,8 @@ async def addxp(self, ctx: commands.Context, user: discord.Member, amount: int):
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         user_data = await db.get_user_data(user.id, ctx.guild.id)
 
         if user_data:
@@ -476,6 +518,8 @@ async def resetlevel(self, ctx: commands.Context, user: discord.Member):
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         await db.reset_user_data(user.id, ctx.guild.id)
 
         embed = discord.Embed(
@@ -497,6 +541,8 @@ async def resetalllevels(self, ctx: commands.Context, confirm: Optional[str] = N
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         if confirm != "CONFIRM":
             embed = discord.Embed(
                 title=" Warning",
@@ -532,6 +578,8 @@ async def setlevelchannel(self, ctx: commands.Context, channel: Optional[discord
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         if channel:
             await db.set_levelup_channel(ctx.guild.id, channel.id)
             embed = discord.Embed(
@@ -561,6 +609,8 @@ async def addrole(self, ctx: commands.Context, level: int, role: discord.Role):
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         if level < 1:
             await self._send(ctx, " Level must be 1 or higher!", ephemeral=True)
             return
@@ -596,6 +646,8 @@ async def removerole(self, ctx: commands.Context, level: int):
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         result = await db.remove_role_reward(ctx.guild.id, level)
 
         if result:
@@ -624,6 +676,8 @@ async def rolerewards(self, ctx: commands.Context):
         if ctx.guild is None:
             return
 
+        await self._maybe_defer(ctx)
+
         role_rewards = await db.get_role_rewards(ctx.guild.id)
 
         if not role_rewards: