Skip to content

Commit f181232

Browse files
committed
Moved get_reference message from ext/info/tags.py to utils/messages.py
1 parent 6f61da0 commit f181232

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

bot/exts/info/tags.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from bot.bot import Bot
1414
from bot.log import get_logger
1515
from bot.pagination import LinePaginator
16-
from bot.utils.messages import wait_for_deletion
16+
from bot.utils.messages import get_reference_message, wait_for_deletion
1717

1818
log = get_logger(__name__)
1919

@@ -278,20 +278,6 @@ def accessible_tags_in_group(self, group: str, member: Member) -> list[str]:
278278
if identifier.group == group and tag.accessible_by(member)
279279
)
280280

281-
async def get_reference_message(self, ctx: Context) -> discord.Message | None:
282-
"""Return a message reference if the reference exists and it does not refer to the author of the message."""
283-
if ctx.message.reference is None:
284-
return None
285-
try:
286-
referenced_message = await ctx.fetch_message(ctx.message.reference.message_id)
287-
except (discord.Forbidden, discord.NotFound):
288-
referenced_message = None
289-
if referenced_message is None:
290-
return None
291-
if referenced_message.author == ctx.author:
292-
return None
293-
return referenced_message
294-
295281
async def get_command_ctx(
296282
self,
297283
ctx: Context,
@@ -318,7 +304,7 @@ async def get_command_ctx(
318304

319305
if embed is not COOLDOWN.obj:
320306

321-
if message_reference := await self.get_reference_message(ctx):
307+
if message_reference := await get_reference_message(ctx):
322308
await wait_for_deletion(
323309
await message_reference.reply(embed=embed),
324310
(ctx.author.id,)

bot/utils/messages.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,3 +285,17 @@ async def upload_log(
285285
raise
286286

287287
return f"{URLs.site_logs_view}/{response['id']}"
288+
289+
async def get_reference_message(ctx: Context) -> discord.Message | None:
290+
"""Return a message reference if the reference exists and it does not refer to the author of the message."""
291+
if ctx.message.reference is None:
292+
return None
293+
try:
294+
referenced_message = await ctx.fetch_message(ctx.message.reference.message_id)
295+
except (discord.Forbidden, discord.NotFound):
296+
referenced_message = None
297+
if referenced_message is None:
298+
return None
299+
if referenced_message.author == ctx.author:
300+
return None
301+
return referenced_message

0 commit comments

Comments
 (0)