Skip to content

Commit 27e8dc3

Browse files
MiddledotLulalaby
authored andcommitted
Fix converters using message.mentions
1 parent f31fa57 commit 27e8dc3

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

discord/ext/commands/converter.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ async def convert(self, ctx: Context, argument: str) -> discord.Member:
237237
else:
238238
user_id = int(match.group(1))
239239
if guild:
240-
result = guild.get_member(user_id) or _utils_get(ctx.message.mentions, id=user_id)
240+
result = guild.get_member(user_id)
241+
if ctx.message is not None and result is None:
242+
result = _utils_get(ctx.message.mentions, id=user_id)
241243
else:
242244
result = _get_from_guilds(bot, 'get_member', user_id)
243245

@@ -283,7 +285,9 @@ async def convert(self, ctx: Context, argument: str) -> discord.User:
283285

284286
if match is not None:
285287
user_id = int(match.group(1))
286-
result = ctx.bot.get_user(user_id) or _utils_get(ctx.message.mentions, id=user_id)
288+
result = ctx.bot.get_user(user_id)
289+
if ctx.message is not None and result is None:
290+
result = _utils_get(ctx.message.mentions, id=user_id)
287291
if result is None:
288292
try:
289293
result = await ctx.bot.fetch_user(user_id)
@@ -907,17 +911,17 @@ async def convert(self, ctx: Context, argument: str) -> str:
907911
if ctx.guild:
908912

909913
def resolve_member(id: int) -> str:
910-
m = _utils_get(msg.mentions, id=id) or ctx.guild.get_member(id)
914+
m = (None if msg == None else _utils_get(msg.mentions, id=id)) or ctx.guild.get_member(id)
911915
return f'@{m.display_name if self.use_nicknames else m.name}' if m else '@deleted-user'
912916

913917
def resolve_role(id: int) -> str:
914-
r = _utils_get(msg.role_mentions, id=id) or ctx.guild.get_role(id)
918+
r = (None if msg == None else _utils_get(msg.mentions, id=id)) or ctx.guild.get_role(id)
915919
return f'@{r.name}' if r else '@deleted-role'
916920

917921
else:
918922

919923
def resolve_member(id: int) -> str:
920-
m = _utils_get(msg.mentions, id=id) or ctx.bot.get_user(id)
924+
m = (None if msg == None else _utils_get(msg.mentions, id=id)) or ctx.bot.get_user(id)
921925
return f'@{m.name}' if m else '@deleted-user'
922926

923927
def resolve_role(id: int) -> str:

0 commit comments

Comments
 (0)