Skip to content

Commit 9c08363

Browse files
authored
fix(converter): fix clean_content not using nicknames in some cases (#1029)
1 parent 5f368e9 commit 9c08363

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

changelog/1029.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
|commands| Fix member nickname not being used by :class:`~ext.commands.clean_content` converter when user wasn't found in mentions.

disnake/ext/commands/converter.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,9 +1027,11 @@ async def convert(self, ctx: AnyContext, argument: str) -> str:
10271027
bot: disnake.Client = ctx.bot
10281028

10291029
def resolve_user(id: int) -> str:
1030-
m = (msg and _utils_get(msg.mentions, id=id)) or bot.get_user(id)
1031-
if m is None and ctx.guild:
1032-
m = ctx.guild.get_member(id)
1030+
m = (
1031+
(msg and _utils_get(msg.mentions, id=id))
1032+
or (ctx.guild and ctx.guild.get_member(id))
1033+
or bot.get_user(id)
1034+
)
10331035
return f"@{m.display_name if self.use_nicknames else m.name}" if m else "@deleted-user"
10341036

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

0 commit comments

Comments
 (0)