diff options
| -rw-r--r-- | discord/ext/commands/converter.py | 10 | ||||
| -rw-r--r-- | docs/ext/commands/commands.rst | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py index 60ad297c..fdce15d1 100644 --- a/discord/ext/commands/converter.py +++ b/discord/ext/commands/converter.py @@ -159,9 +159,11 @@ class UserConverter(IDConverter): return result -class MessageConverter(IDConverter): +class MessageConverter: """Converts to a :class:`discord.Message`. + .. versionadded:: 1.1.0 + The lookup strategy is as follows (in order): 1. Lookup by "{channel ID}-{message ID}" (retrieved by shift-clicking on "Copy ID") @@ -174,7 +176,7 @@ class MessageConverter(IDConverter): link_regex = re.compile( r'^https?://(?:(ptb|canary)\.)?discordapp\.com/channels/' r'(?:([0-9]{15,21})|(@me))' - r'/(?P<channel_id>[0-9]{15,21})/(?P<message_id>[0-9]{15,21})$' + r'/(?P<channel_id>[0-9]{15,21})/(?P<message_id>[0-9]{15,21})/?$' ) match = id_regex.match(argument) or link_regex.match(argument) if not match: @@ -189,9 +191,9 @@ class MessageConverter(IDConverter): raise BadArgument('Channel "{channel}" not found.'.format(channel=channel_id)) try: return await channel.fetch_message(message_id) - except discord.errors.NotFound: + except discord.NotFound: raise BadArgument('Message "{msg}" not found.'.format(msg=argument)) - except discord.errors.Forbidden: + except discord.Forbidden: raise BadArgument("Can't read messages in {channel}".format(channel=channel.mention)) class TextChannelConverter(IDConverter): diff --git a/docs/ext/commands/commands.rst b/docs/ext/commands/commands.rst index dbf618d6..19e2bf4a 100644 --- a/docs/ext/commands/commands.rst +++ b/docs/ext/commands/commands.rst @@ -394,6 +394,8 @@ converter is given below: +-----------------------+-------------------------------------------------+ | :class:`Member` | :class:`~ext.commands.MemberConverter` | +-----------------------+-------------------------------------------------+ +| :class:`Message` | :class:`~ext.commands.MessageConverter` | ++-----------------------+-------------------------------------------------+ | :class:`User` | :class:`~ext.commands.UserConverter` | +-----------------------+-------------------------------------------------+ | :class:`TextChannel` | :class:`~ext.commands.TextChannelConverter` | |