Merge pull request #459 from bast0006/fix-bast-linkwrap-syntax

Make .bm handle embed-suppression syntax for message links

2 files changed, 18 insertions, 1 deletions

diff --git a/bot/exts/evergreen/bookmark.py b/bot/exts/evergreen/bookmark.py
index 73908702..5fa05d2e 100644
--- a/bot/exts/evergreen/bookmark.py
+++ b/bot/exts/evergreen/bookmark.py
@@ -5,6 +5,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Colours, ERROR_REPLIES, Emojis, Icons
+from bot.utils.converters import WrappedMessageConverter
 
 log = logging.getLogger(__name__)
 
@@ -19,7 +20,7 @@ class Bookmark(commands.Cog):
     async def bookmark(
         self,
         ctx: commands.Context,
-        target_message: discord.Message,
+        target_message: WrappedMessageConverter,
         *,
         title: str = "Bookmark"
     ) -> None:
diff --git a/bot/utils/converters.py b/bot/utils/converters.py
new file mode 100644
index 00000000..228714c9
--- /dev/null
+++ b/bot/utils/converters.py
@@ -0,0 +1,16 @@
+import discord
+from discord.ext.commands.converter import MessageConverter
+
+
+class WrappedMessageConverter(MessageConverter):
+    """A converter that handles embed-suppressed links like <http://example.com>."""
+
+    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]
+        if argument.startswith("<") and argument.endswith(">"):
+            argument = argument[1:-1]
+
+        return await super().convert(ctx, argument)