Skip to content

fix(converter): fix clean_content not using nicknames in some cases #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 24, 2023
Merged

fix(converter): fix clean_content not using nicknames in some cases #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38211bb
fix(converter): fix `clean_content.use_nicknames` not working as expe…
shiftinv May 7, 2023
d9bf49d
docs: add changelog entry
shiftinv May 7, 2023
702a0cd
Merge branch 'master' into fix/converter-clean-display-name
shiftinv May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/1029.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
|commands| Fix member nickname not being used by :class:`~ext.commands.clean_content` converter when user wasn't found in mentions.
8 changes: 5 additions & 3 deletions disnake/ext/commands/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,9 +1027,11 @@ async def convert(self, ctx: AnyContext, argument: str) -> str:
bot: disnake.Client = ctx.bot

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

def resolve_role(id: int) -> str:
Expand Down