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

Fix bug that made member roles go missing.

Browse Source
This commit is contained in:
Rapptz 2017-01-03 20:15:56 -05:00
parent 3f06cf9e81
commit c863d93f69
3 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
discord/guild.py
View File

@ -226,13 +226,6 @@ class Guild(Hashable):
self.splash = guild.get('splash') self.splash = guild.get('splash')
for mdata in guild.get('members', []): for mdata in guild.get('members', []):
roles = [self.default_role]
for role_id in mdata['roles']:
role = utils.find(lambda r: r.id == role_id, self.roles)
if role is not None:
roles.append(role)
mdata['roles'] = roles
member = Member(data=mdata, guild=self, state=self._state) member = Member(data=mdata, guild=self, state=self._state)
self._add_member(member) self._add_member(member)

29
discord/member.py
View File

@ -145,12 +145,12 @@ class Member(discord.abc.Messageable):
def __init__(self, *, data, guild, state): def __init__(self, *, data, guild, state):
self._state = state self._state = state
self._user = state.store_user(data['user']) self._user = state.store_user(data['user'])
self.guild = guild
self.joined_at = utils.parse_time(data.get('joined_at')) self.joined_at = utils.parse_time(data.get('joined_at'))
self.roles = data.get('roles', []) self._update_roles(data)
self.status = Status.offline self.status = Status.offline
game = data.get('game', {}) game = data.get('game', {})
self.game = Game(**game) if game else None self.game = Game(**game) if game else None
self.guild = guild
self.nick = data.get('nick', None) self.nick = data.get('nick', None)
def __str__(self): def __str__(self):
@ -177,6 +177,22 @@ class Member(discord.abc.Messageable):
def _get_guild_id(self): def _get_guild_id(self):
return None return None
def _update_roles(self, data):
# update the roles
self.roles = [self.guild.default_role]
for role in self.guild.roles:
if role.id in data['roles']:
self.roles.append(role)
self.roles = [self.guild.default_role]
for roleid in map(int, data['roles']):
role = utils.find(lambda r: r.id == roleid, self.guild.roles)
if role is not None:
self.roles.append(role)
# sort the roles by ID since they can be "randomised"
self.roles.sort(key=lambda r: r.id)
def _update(self, data, user=None): def _update(self, data, user=None):
if user: if user:
self._user.name = user['username'] self._user.name = user['username']
@ -191,14 +207,7 @@ class Member(discord.abc.Messageable):
except KeyError: except KeyError:
pass pass
# update the roles self._update_roles(data)
self.roles = [self.guild.default_role]
for role in self.guild.roles:
if role.id in data['roles']:
self.roles.append(role)
# sort the roles by ID since they can be "randomised"
self.roles.sort(key=lambda r: int(r.id))
def _presence_update(self, data, user): def _presence_update(self, data, user):
self.status = try_enum(Status, data['status']) self.status = try_enum(Status, data['status'])

16
discord/state.py
View File

@ -330,7 +330,7 @@ class ConnectionState:
# skip these useless cases. # skip these useless cases.
return return
member = self._make_member(guild, data) member = Member(guild=guild, data=data, state=self)
guild._add_member(member) guild._add_member(member)
old_member = copy.copy(member) old_member = copy.copy(member)
@ -402,19 +402,9 @@ class ConnectionState:
else: else:
self.dispatch('group_remove', channel, user) self.dispatch('group_remove', channel, user)
def _make_member(self, guild, data):
roles = [guild.default_role]
for roleid in data.get('roles', []):
role = utils.get(guild.roles, id=roleid)
if role is not None:
roles.append(role)
data['roles'] = sorted(roles, key=lambda r: r.id)
return Member(guild=guild, data=data, state=self)
def parse_guild_member_add(self, data): def parse_guild_member_add(self, data):
guild = self._get_guild(int(data['guild_id'])) guild = self._get_guild(int(data['guild_id']))
member = self._make_member(guild, data) member = Member(guild=guild, data=data, state=self)
guild._add_member(member) guild._add_member(member)
guild._member_count += 1 guild._member_count += 1
self.dispatch('member_join', member) self.dispatch('member_join', member)
@ -605,7 +595,7 @@ class ConnectionState:
guild = self._get_guild(int(data['guild_id'])) guild = self._get_guild(int(data['guild_id']))
members = data.get('members', []) members = data.get('members', [])
for member in members: for member in members:
m = self._make_member(guild, member) m = Member(guild=guild, data=member, state=self)
existing = guild.get_member(m.id) existing = guild.get_member(m.id)
if existing is None or existing.joined_at is None: if existing is None or existing.joined_at is None:
guild._add_member(m) guild._add_member(m)