matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Handle user updates within GUILD_MEMBER_UPDATE

Browse Source
This commit is contained in:
Rapptz 2020-09-04 08:32:02 -04:00
parent 95bec0dcee
commit e8e4886fd8
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
discord/member.py
View File

@ -266,17 +266,20 @@ class Member(discord.abc.Messageable, _BaseUser):
self._client_status[None] = data['status'] self._client_status[None] = data['status']
if len(user) > 1: if len(user) > 1:
u = self._user return self._update_inner_user(user)
original = (u.name, u.avatar, u.discriminator)
# These keys seem to always be available
modified = (user['username'], user['avatar'], user['discriminator'])
if original != modified:
to_return = User._copy(self._user)
u.name, u.avatar, u.discriminator = modified
# Signal to dispatch on_user_update
return to_return, u
return False return False
def _update_inner_user(self, user):
u = self._user
original = (u.name, u.avatar, u.discriminator)
# These keys seem to always be available
modified = (user['username'], user['avatar'], user['discriminator'])
if original != modified:
to_return = User._copy(self._user)
u.name, u.avatar, u.discriminator = modified
# Signal to dispatch on_user_update
return to_return, u
@property @property
def status(self): def status(self):
""":class:`Status`: The member's overall status. If the value is unknown, then it will be a :class:`str` instead.""" """:class:`Status`: The member's overall status. If the value is unknown, then it will be a :class:`str` instead."""
@ -433,7 +436,7 @@ class Member(discord.abc.Messageable, _BaseUser):
guild = self.guild guild = self.guild
if len(self._roles) == 0: if len(self._roles) == 0:
return guild.default_role return guild.default_role
return max(guild.get_role(rid) or guild.default_role for rid in self._roles) return max(guild.get_role(rid) or guild.default_role for rid in self._roles)
@property @property

6
discord/state.py
View File

@ -692,8 +692,12 @@ class ConnectionState:
member = guild.get_member(user_id) member = guild.get_member(user_id)
if member is not None: if member is not None:
old_member = copy.copy(member) old_member = Member._copy(member)
member._update(data) member._update(data)
user_update = member._update_inner_user(user)
if user_update:
self.dispatch('user_update', user_update[0], user_update[1])
self.dispatch('member_update', old_member, member) self.dispatch('member_update', old_member, member)
else: else:
log.debug('GUILD_MEMBER_UPDATE referencing an unknown member ID: %s. Discarding.', user_id) log.debug('GUILD_MEMBER_UPDATE referencing an unknown member ID: %s. Discarding.', user_id)