set botlevel allowed_mentions and also fix ctx.reply

Author: AbstractUmbra

core/bot.py

@@ -64,6 +64,7 @@ def __init__(self):
         super().__init__(
             command_prefix=commands.when_mentioned_or(CONFIG["prefix"]),
             intents=discord.Intents.all(),
+            allowed_mentions=discord.AllowedMentions.none(),
         )
         self._previous_websocket_events: deque[Any] = deque(maxlen=10)
 

core/context.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, TYPE_CHECKING, TypeAlias
+from typing import TYPE_CHECKING, TypeAlias
 
 import discord
 from discord.ext import commands
@@ -23,6 +23,19 @@
 
 
 class Context(commands.Context["Bot"]):
+    @discord.utils.cached_property
+    def replied_reference(self) -> discord.MessageReference | None:
+        ref = self.message.reference
+        if ref and isinstance(ref.resolved, discord.Message):
+            return ref.resolved.to_reference()
+        return None
+
+    @discord.utils.cached_property
+    def replied_message(self) -> discord.Message | None:
+        ref = self.message.reference
+        if ref and isinstance(ref.resolved, discord.Message):
+            return ref.resolved
+        return None
 
     def author_is_mod(self) -> bool:
         member: discord.Member
@@ -46,13 +59,6 @@ def author_is_mod(self) -> bool:
         roles = member._roles  # type: ignore # we know this won't change for a while
         return roles.has(Roles.ADMIN) or roles.has(Roles.MODERATOR)
 
-    @discord.utils.copy_doc(commands.Context.reply) # type: ignore
-    async def reply(self, content: str | None = None, **kwargs: Any) -> discord.Message:
-        if "mention_author" not in kwargs:
-            kwargs["mention_author"] = False
-
-        return await super().reply(content, **kwargs)
-
 
 class GuildContext(Context):
     guild: discord.Guild  # type: ignore # type lie due to narrowing

modules/manuals.py

@@ -96,19 +96,6 @@ def _smart_guess_lib(self, ctx: core.Context) -> LibEnum | None:
 
         return None
 
-    async def context_reply(
-        self,
-        ctx: core.Context,
-        content: str | None = discord.utils.MISSING,
-        embed: discord.Embed | None = discord.utils.MISSING,
-        reference: discord.MessageReference | None = None,
-        mention_author: bool = True,
-    ) -> discord.Message:
-        if ctx.message.reference and not reference:
-            reference = ctx.message.reference
-
-        return await ctx.send(content=content, embed=embed, reference=reference, mention_author=mention_author)
-
     @commands.command(
         "rtfm",
         brief="Searches documentation",
@@ -141,7 +128,7 @@ async def rtfm(self, ctx: core.Context, *, query: str) -> None:
                 await ctx.reply("Sorry, I couldn't apply a default library to this channel. Try again with a library?")
                 return
 
-            await self.context_reply(ctx, str(lib.value))
+            await ctx.reply(str(lib.value), reference=ctx.replied_message)
             return
 
         labels = False
@@ -174,7 +161,7 @@ async def rtfm(self, ctx: core.Context, *, query: str) -> None:
             return
 
         if not final_query:
-            await self.context_reply(ctx, str(lib.value[0]))
+            await ctx.reply(str(lib.value[0]), reference=ctx.replied_message)
             return
 
         url = self.target.with_path("/api/public/rtfm.sphinx").with_query(
@@ -239,7 +226,7 @@ async def rtfs(self, ctx: core.Context, *, query: str) -> None:
                 await ctx.reply("Sorry, I couldn't apply a default library to this channel. Try again with a library?")
                 return
 
-            await self.context_reply(ctx, str(lib.value))
+            await ctx.reply(str(lib.value), reference=ctx.replied_message)
             return
 
         source = False
@@ -310,9 +297,7 @@ async def rtfs(self, ctx: core.Context, *, query: str) -> None:
 
         else:
             n = next(iter(nodes.items()))
-            await self.context_reply(
-                ctx, f"Showing source for `{n[0]}`\nCommit: {matches['commit'][:6]}", mention_author=False
-            )
+            await ctx.reply(f"Showing source for `{n[0]}`\nCommit: {matches['commit'][:6]}", reference=ctx.replied_message)
 
             pages = TextPager(ctx, n[1], prefix="```py")
             await pages.paginate()