From 67bc58c1cc50fdf479274f4eb3e9f394363a7e6d Mon Sep 17 00:00:00 2001 From: bast Date: Fri, 25 Sep 2020 12:16:12 -0700 Subject: Make .bm handle embed-suppression syntax for message links [link] and [] are also supported --- bot/utils/converters.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 bot/utils/converters.py (limited to 'bot/utils/converters.py') diff --git a/bot/utils/converters.py b/bot/utils/converters.py new file mode 100644 index 00000000..74a0b5b7 --- /dev/null +++ b/bot/utils/converters.py @@ -0,0 +1,15 @@ +import discord + +from discord.ext.commands.converter import MessageConverter + + +class BetterMessageConverter(MessageConverter): + """A converter that handles embed-suppressed links like """ + async def convert(self, ctx, argument: str) -> discord.Message: + # It's possible to wrap a message in [<>] as well, and it's supported because its easy + if argument.startswith("[") and argument.endswith("]"): + argument = argument[1:-1] + if argument.startswith("<") and argument.endswith(">"): + argument = argument[1:-1] + + return await super().convert(ctx, argument) -- cgit v1.2.3 From 5707d6fce9eccf9aba1bede459b7cf8daa04e33e Mon Sep 17 00:00:00 2001 From: bast Date: Fri, 25 Sep 2020 14:25:29 -0700 Subject: Add more docstrings and flake8 cleanup --- bot/exts/evergreen/bookmark.py | 1 - bot/utils/converters.py | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bot/utils/converters.py') diff --git a/bot/exts/evergreen/bookmark.py b/bot/exts/evergreen/bookmark.py index 0adf1e68..bb86e18d 100644 --- a/bot/exts/evergreen/bookmark.py +++ b/bot/exts/evergreen/bookmark.py @@ -5,7 +5,6 @@ import discord from discord.ext import commands from bot.constants import Colours, ERROR_REPLIES, Emojis, Icons - from bot.utils.converters import BetterMessageConverter log = logging.getLogger(__name__) diff --git a/bot/utils/converters.py b/bot/utils/converters.py index 74a0b5b7..f36fa03a 100644 --- a/bot/utils/converters.py +++ b/bot/utils/converters.py @@ -1,11 +1,12 @@ import discord - from discord.ext.commands.converter import MessageConverter class BetterMessageConverter(MessageConverter): - """A converter that handles embed-suppressed links like """ - async def convert(self, ctx, argument: str) -> discord.Message: + """A converter that handles embed-suppressed links like .""" + + async def convert(self, ctx: discord.ext.commands.Context, argument: str) -> discord.Message: + """Wrap the commands.MessageConverter to handle <> delimited message links.""" # It's possible to wrap a message in [<>] as well, and it's supported because its easy if argument.startswith("[") and argument.endswith("]"): argument = argument[1:-1] -- cgit v1.2.3 From 3713b1f1eea335bfdd16aadd25829039fe372fe0 Mon Sep 17 00:00:00 2001 From: bast Date: Tue, 29 Sep 2020 19:39:24 -0700 Subject: Rename BetterMessageConverter -> WrappedMessageConverter --- bot/exts/evergreen/bookmark.py | 4 ++-- bot/utils/converters.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bot/utils/converters.py') diff --git a/bot/exts/evergreen/bookmark.py b/bot/exts/evergreen/bookmark.py index bb86e18d..5fa05d2e 100644 --- a/bot/exts/evergreen/bookmark.py +++ b/bot/exts/evergreen/bookmark.py @@ -5,7 +5,7 @@ import discord from discord.ext import commands from bot.constants import Colours, ERROR_REPLIES, Emojis, Icons -from bot.utils.converters import BetterMessageConverter +from bot.utils.converters import WrappedMessageConverter log = logging.getLogger(__name__) @@ -20,7 +20,7 @@ class Bookmark(commands.Cog): async def bookmark( self, ctx: commands.Context, - target_message: BetterMessageConverter, + target_message: WrappedMessageConverter, *, title: str = "Bookmark" ) -> None: diff --git a/bot/utils/converters.py b/bot/utils/converters.py index f36fa03a..228714c9 100644 --- a/bot/utils/converters.py +++ b/bot/utils/converters.py @@ -2,7 +2,7 @@ import discord from discord.ext.commands.converter import MessageConverter -class BetterMessageConverter(MessageConverter): +class WrappedMessageConverter(MessageConverter): """A converter that handles embed-suppressed links like .""" async def convert(self, ctx: discord.ext.commands.Context, argument: str) -> discord.Message: -- cgit v1.2.3