Handle cases where people put False-like values for game presences.

Rapptz · Jan 12, 2016 · 4ea0150 · 4ea0150
1 parent 8974dff
commit 4ea0150
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/discord/member.py b/discord/member.py
@@ -76,8 +76,8 @@ def __init__(self, deaf, joined_at, user, roles, mute, **kwargs):
         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
@@ -176,8 +176,8 @@ def _from_data(self, guild):
                     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
@@ -147,8 +147,8 @@ def parse_presence_update(self, data):
                 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)