Merge branch 'main' into dependabot/github_actions/astral-sh/setup-uv-7

Author: Xithrius

.github/workflows/build-deploy.yaml

@@ -17,13 +17,13 @@ jobs:
 
       # Check out the current repository in the `sir-lancebot` subdirectory
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to Github Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -54,7 +54,7 @@ jobs:
 
     steps:
       - name: Checkout Kubernetes Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: python-discord/infra
           path: infra

.github/workflows/lint.yaml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install uv
         uses: astral-sh/setup-uv@v7

.github/workflows/sentry_release.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Create a Sentry.io release
         uses: getsentry/action-release@v3

bot/exts/core/help.py

@@ -4,7 +4,7 @@
 from contextlib import suppress
 from typing import NamedTuple
 
-from discord import Colour, Embed, HTTPException, Message, Reaction, User
+from discord import ChannelType, Colour, Embed, HTTPException, Message, NotFound, Object, RawReactionActionEvent
 from discord.ext import commands
 from discord.ext.commands import CheckFailure, Cog as DiscordCog, Command, Context
 from pydis_core.utils.logging import get_logger
@@ -182,33 +182,43 @@ def reset_timeout(self) -> None:
         # recreate the timeout task
         self._timeout_task = self._bot.loop.create_task(self.timeout())
 
-    async def on_reaction_add(self, reaction: Reaction, user: User) -> None:
-        """Event handler for when reactions are added on the help message."""
-        # ensure it was the relevant session message
-        if reaction.message.id != self.message.id:
+
+    async def on_raw_reaction_add(self, payload: RawReactionActionEvent) -> None:
+        """Handle raw reaction events for DM compatibility."""
+        # Ignore if not our message
+        if payload.message_id != self.message.id:
             return
 
-        # ensure it was the session author who reacted
-        if user.id != self.author.id:
+        # Ignore if not the session author
+        if payload.user_id != self.author.id:
             return
 
-        emoji = str(reaction.emoji)
+        # Get the emoji string
+        emoji = str(payload.emoji)
 
-        # check if valid action
+        # Check if valid action
         if emoji not in REACTIONS:
             return
 
         self.reset_timeout()
 
+        # Remove the reaction to prep for re-use
+        try:
+            # We need to get the actual message and user objects for remove_reaction
+            channel = self._bot.get_channel(payload.channel_id)
+            if channel and channel.type != ChannelType.private:
+                # channel is None in DMs, this condition skips reaction removal in DMs to prevent exceptions
+                message = channel.get_partial_message(payload.message_id)
+                await message.remove_reaction(payload.emoji, Object(id=payload.user_id))
+        except (HTTPException, NotFound):
+            # Ignore errors when removing reactions
+            pass
+
         # Run relevant action method
         action = getattr(self, f"do_{REACTIONS[emoji]}", None)
         if action:
             await action()
 
-        # remove the added reaction to prep for re-use
-        with suppress(HTTPException):
-            await self.message.remove_reaction(reaction, user)
-
     async def on_message_delete(self, message: Message) -> None:
         """Closes the help session when the help message is deleted."""
         if message.id == self.message.id:
@@ -219,7 +229,7 @@ async def prepare(self) -> None:
         await self.build_pages()
         await self.update_page()
 
-        self._bot.add_listener(self.on_reaction_add)
+        self._bot.add_listener(self.on_raw_reaction_add)
         self._bot.add_listener(self.on_message_delete)
 
         self.add_reactions()
@@ -459,7 +469,7 @@ async def start(cls, ctx: Context, *command, **options) -> "HelpSession":
 
     async def stop(self) -> None:
         """Stops the help session, removes event listeners and attempts to delete the help message."""
-        self._bot.remove_listener(self.on_reaction_add)
+        self._bot.remove_listener(self.on_raw_reaction_add)
         self._bot.remove_listener(self.on_message_delete)
 
         # ignore if permission issue, or the message doesn't exist

bot/exts/fun/fun.py

@@ -5,6 +5,7 @@
 from typing import Literal
 
 import pyjokes
+from aiohttp import ClientError, ClientResponseError
 from discord import Embed
 from discord.ext import commands
 from discord.ext.commands import BadArgument, Cog, Context
@@ -14,6 +15,7 @@
 from bot.bot import Bot
 from bot.constants import Client, Colours, Emojis
 from bot.utils import helpers, messages
+from bot.utils.quote import daily_quote, random_quote
 
 log = get_logger(__name__)
 
@@ -158,6 +160,57 @@ async def joke(self, ctx: commands.Context, category: Literal["neutral", "chuck"
         joke = pyjokes.get_joke(category=category)
         await ctx.send(joke)
 
+    @commands.group(name="quote")
+    async def quote(self, ctx: Context) -> None:
+        """
+        Retrieve a quote from zenquotes.io api.
+
+        See `random`, `daily` subcommands.
+        """
+        if ctx.invoked_subcommand is None:
+            await ctx.invoke(self.bot.get_command("help"), "quote")
+
+    @quote.command(name="daily")
+    async def quote_daily(self, ctx: Context) -> None:
+        """Retrieve the daily quote from zenquotes.io api."""
+        try:
+            quote = await daily_quote(self.bot)
+            embed = Embed(
+                title="Daily Quote",
+                description=f"> {quote}\n\n-# Powered by [zenquotes.io](https://zenquotes.io)",
+                colour=Colours.blue
+            )
+            await ctx.send(embed=embed)
+        except ClientResponseError as e:
+            log.warning(f"ZenQuotes API error: {e.status} {e.message}")
+            await ctx.send(":x: Could not retrieve quote from API.")
+        except (ClientError, TimeoutError) as e:
+            log.error(f"Network error fetching quote: {e}")
+            await ctx.send(":x: Could not connect to the quote service.")
+        except Exception:
+            log.exception("Unexpected error fetching quote.")
+            await ctx.send(":x: Something unexpected happened. Try again later.")
+
+    @quote.command(name="random")
+    async def quote_random(self, ctx: Context) -> None:
+        """Retrieve a random quote from zenquotes.io api."""
+        try:
+            quote = await random_quote(self.bot)
+            embed = Embed(
+                title="Random Quote",
+                description=f"> {quote}\n\n-# Powered by [zenquotes.io](https://zenquotes.io)",
+                colour=Colours.blue
+            )
+            await ctx.send(embed=embed)
+        except ClientResponseError as e:
+            log.warning(f"ZenQuotes API error: {e.status} {e.message}")
+            await ctx.send(":x: Could not retrieve quote from API.")
+        except (ClientError, TimeoutError) as e:
+            log.error(f"Network error fetching quote: {e}")
+            await ctx.send(":x: Could not connect to the quote service.")
+        except Exception:
+            log.exception("Unexpected error fetching quote.")
+            await ctx.send(":x: Something unexpected happened. Try again later.")
 
 async def setup(bot: Bot) -> None:
     """Load the Fun cog."""

bot/exts/fun/space.py

@@ -1,3 +1,5 @@
+# XXX: Disabled due to issues with NASA API, see https://github.com/python-discord/sir-lancebot/issues/1709
+
 import random
 from datetime import UTC, date, datetime
 from typing import Any
@@ -231,4 +233,7 @@ async def setup(bot: Bot) -> None:
         logger.warning("Can't find NASA API key. Not loading Space Cog.")
         return
 
-    await bot.add_cog(Space(bot))
+    # XXX: Disabled due to issues with NASA API, see https://github.com/python-discord/sir-lancebot/issues/1709
+
+    # await bot.add_cog(Space(bot))
+    return

bot/exts/fun/status_codes.py

@@ -27,8 +27,8 @@ def __init__(self, bot: Bot):
         self.bot = bot
 
     @commands.group(
-        name="http_status",
-        aliases=("status", "httpstatus"),
+        name="http",
+        aliases=("http_status", "httpstatus", "status"),
         invoke_without_command=True,
     )
     async def http_status_group(self, ctx: commands.Context, code: int) -> None:

bot/exts/holidays/holidayreact.py

@@ -75,7 +75,7 @@ class Holiday(NamedTuple):
     "jack-o-lantern": Trigger(r"\bjack-o-lantern\b", ["\U0001F383"]),
     "pumpkin": Trigger(r"\bpumpkin\b", ["\U0001F383"]),
     "skeleton": Trigger(r"\bskeleton\b", ["\U0001F480"]),
-    "spooky": Trigger(r"\bspo{2,}[k|p][i|y](er|est)?\b", ["\U0001F47B"]),
+    "spooky": Trigger(r"\bspo{2,}[kp][iy](er|est)?\b", ["\U0001F47B"]),
     }
 )
 Hanukkah = Holiday([Month.NOVEMBER, Month.DECEMBER], {