Skip to content

Commit 7f85ee4

Browse files
feat: add attribute
1 parent 80ae3b9 commit 7f85ee4

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

monty/events.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ def text(self) -> str:
3434
@functools.cached_property
3535
def urls(self) -> list[str]:
3636
"""Return the URLs found in the message."""
37-
text = self.text
38-
return list(extract_urls(text))
37+
return list(extract_urls(self.text))
3938

4039
@classmethod
4140
def from_message_inter(

monty/exts/info/codesnippets.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,8 @@ async def _parse_snippets(self, *, content: str | None = None, context: MessageC
352352
return "\n".join(m[1] for m in sorted(all_snippets))
353353

354354
@commands.Cog.listener(MontyEvent.monty_message_processed.value)
355-
async def on_message(self, context: MessageContext) -> None:
355+
async def on_message(self, message: disnake.Message, context: MessageContext) -> None:
356356
"""Checks if the message has a snippet link, removes the embed, then sends the snippet contents."""
357-
message = context.message
358357
if not message.guild:
359358
return
360359

@@ -368,7 +367,7 @@ async def on_message(self, context: MessageContext) -> None:
368367
if not my_perms.send_messages:
369368
return
370369

371-
message_to_send = await self._parse_snippets(message.content)
370+
message_to_send = await self._parse_snippets(content=context.text)
372371
destination = message.channel
373372

374373
if 0 < len(message_to_send) <= 2000 and message_to_send.count("\n") <= 27:
@@ -394,7 +393,7 @@ async def send_expanded_links(self, inter: disnake.MessageInteraction) -> None:
394393

395394
custom_id = inter.data.custom_id[len(EXPAND_BUTTON_PREFIX) :]
396395
link = decode_github_link(custom_id)
397-
snippet = await self._parse_snippets(link)
396+
snippet = await self._parse_snippets(content=link)
398397

399398
def disable_button() -> disnake.ui.View:
400399
view = disnake.ui.View.from_message(inter.message)

monty/utils/code.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ def prepare_input(code: str, *, require_fenced: bool = False) -> str | None:
4545
if len(blocks) > 1:
4646
code = "\n".join(block.group("code") for block in blocks)
4747
info = "several code blocks"
48+
elif len(match) > 1:
49+
code = "\n".join(block.group("code") for block in match)
50+
info = "several code blocks"
4851
else:
4952
match = match[0] if len(blocks) == 0 else blocks[0]
5053
code, block, lang, delim = match.group("code", "block", "lang", "delim")

monty/utils/markdown.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
CODE_BLOCK_RE = re.compile(
20-
r"(?P<delim>`{1,2})([^\n]+?)(?P=delim)|```(.+?)```",
20+
r"```(.+?)```|(?P<delim>`{1,2})([^\n]+?)(?P=delim)",
2121
re.DOTALL | re.MULTILINE,
2222
)
2323

0 commit comments

Comments
 (0)