aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-05-10 06:04:31 -0400
committerRapptz <[email protected]>2016-05-10 06:04:44 -0400
commitcf2bee5c43f44a7bccd5ef85e48540daf8f75374 (patch)
tree59da2e96925f9474b2b3209a54f6274189f380a5
parentAdd Game.type and Game.url attributes to change streaming status. (diff)
downloaddiscord.py-cf2bee5c43f44a7bccd5ef85e48540daf8f75374.tar.xz
discord.py-cf2bee5c43f44a7bccd5ef85e48540daf8f75374.zip
Fix issue with Member.joined_at being None.
-rw-r--r--discord/state.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/discord/state.py b/discord/state.py
index 8209dbfd..f5ca1181 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -492,7 +492,8 @@ class ConnectionState:
members = data.get('members', [])
for member in members:
m = self._make_member(server, member)
- if m.id not in server._members:
+ existing = server.get_member(m.id)
+ if existing is None or existing.joined_at is None:
server._add_member(m)
# if the owner is offline, server.owner is potentially None