aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-01-11 19:50:13 -0500
committerRapptz <[email protected]>2016-01-11 19:50:13 -0500
commit4ea015067fa9333a5288df66c95a1cb876486953 (patch)
tree84d53a084631a263cb3251082a2dece3be6a1168
parentChange internal update functions to have a leading underscore. (diff)
downloaddiscord.py-4ea015067fa9333a5288df66c95a1cb876486953.tar.xz
discord.py-4ea015067fa9333a5288df66c95a1cb876486953.zip
Handle cases where people put False-like values for game presences.
-rw-r--r--discord/member.py4
-rw-r--r--discord/server.py4
-rw-r--r--discord/state.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/discord/member.py b/discord/member.py
index 88b1af9d..cc6392b6 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -76,8 +76,8 @@ class Member(User):
self.joined_at = parse_time(joined_at)
self.roles = roles
self.status = Status.offline
- game = kwargs.get('game')
- self.game = game and Game(**game)
+ game = kwargs.get('game', {})
+ self.game = Game(**game) if game else None
self.server = kwargs.get('server', None)
self._update_voice_state(mute=mute, deaf=deaf)
diff --git a/discord/server.py b/discord/server.py
index 756e7897..765db2fb 100644
--- a/discord/server.py
+++ b/discord/server.py
@@ -176,8 +176,8 @@ class Server(Hashable):
member.status = Status(member.status)
except:
pass
- game = presence.get('game')
- member.game = game and Game(**game)
+ game = presence.get('game', {})
+ member.game = Game(**game) if game else None
if 'channels' in guild:
channels = guild['channels']
diff --git a/discord/state.py b/discord/state.py
index 54770292..fb000d5c 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -147,8 +147,8 @@ class ConnectionState:
except:
pass
- game = data.get('game')
- member.game = game and Game(**game)
+ game = data.get('game', {})
+ member.game = Game(**game) if game else None
member.name = user.get('username', member.name)
member.avatar = user.get('avatar', member.avatar)