From 2e6882bd8c8e21765794a6b2b54ee0be19339716 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Wed, 10 Jul 2019 04:36:07 -0400 Subject: [PATCH] [commands] Fall back to using Message.mentions in converters Useful if there's no cache. --- discord/ext/commands/converter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py index 86a3db45a..ea202b656 100644 --- a/discord/ext/commands/converter.py +++ b/discord/ext/commands/converter.py @@ -58,6 +58,8 @@ def _get_from_guilds(bot, getter, argument): return result return result +_utils_get = discord.utils.get + class Converter: """The base class of custom converters that require the :class:`.Context` to be passed to be useful. @@ -124,7 +126,7 @@ class MemberConverter(IDConverter): else: user_id = int(match.group(1)) if guild: - result = guild.get_member(user_id) + result = guild.get_member(user_id) or _utils_get(ctx.message.mentions, id=user_id) else: result = _get_from_guilds(bot, 'get_member', user_id) @@ -152,7 +154,7 @@ class UserConverter(IDConverter): if match is not None: user_id = int(match.group(1)) - result = ctx.bot.get_user(user_id) + result = ctx.bot.get_user(user_id) or _utils_get(ctx.message.mentions, id=user_id) else: arg = argument # check for discriminator if it exists