mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-09-07 10:22:59 +00:00
Code Issues Projects Releases Wiki Activity

Initial support for pomelo migration

Browse Source
This commit is contained in:
Rapptz
2023-05-03 23:48:46 -04:00
parent 66689e16e8
commit df01db3490
11 changed files with 93 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
discord/guild.py
View File

@ -1075,26 +1075,20 @@ class Guild(Hashable):
def get_member_named(self, name: str, /) -> Optional[Member]:
"""Returns the first member found that matches the name provided.
The name can have an optional discriminator argument, e.g. "Jake#0001"
or "Jake" will both do the lookup. However the former will give a more
precise result. Note that the discriminator must have all 4 digits
for this to work.
If a nickname is passed, then it is looked up via the nickname. Note
however, that a nickname + discriminator combo will not lookup the nickname
but rather the username + discriminator combo due to nickname + discriminator
not being unique.
If no member is found, ``None`` is returned.
.. versionchanged:: 2.0
``name`` parameter is now positional-only.
.. versionchanged:: 2.3
``discriminator`` is no longer used in lookup, due to being removed on Discord.
Parameters
-----------
name: :class:`str`
The name of the member to lookup with an optional discriminator.
The name of the member to lookup.
Returns
--------
@ -1103,22 +1097,10 @@ class Guild(Hashable):
then ``None`` is returned.
"""
result = None
members = self.members
if len(name) > 5 and name[-5] == '#':
# The 5 length is checking to see if #0000 is in the string,
# as a#0000 has a length of 6, the minimum for a potential
# discriminator lookup.
potential_discriminator = name[-4:]
# do the actual lookup and return if found
# if it isn't found then we'll do a full name lookup below.
result = utils.get(members, name=name[:-5], discriminator=potential_discriminator)
if result is not None:
return result
def pred(m: Member) -> bool:
return m.nick == name or m.name == name
return m.nick == name or m.global_name == name or m.name == name
return utils.find(pred, members)