From d9960dd421963f23e7386239e23a435b816a09a7 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Fri, 15 Nov 2019 04:37:39 -0500 Subject: [PATCH] animation field in reaction objects are not consistently available --- discord/state.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/discord/state.py b/discord/state.py index a974b163a..18c696553 100644 --- a/discord/state.py +++ b/discord/state.py @@ -404,9 +404,9 @@ class ConnectionState: self.dispatch('raw_message_edit', raw) def parse_message_reaction_add(self, data): - emoji_data = data['emoji'] - emoji_id = utils._get_as_snowflake(emoji_data, 'id') - emoji = PartialEmoji.with_state(self, animated=emoji_data['animated'], id=emoji_id, name=emoji_data['name']) + emoji = data['emoji'] + emoji_id = utils._get_as_snowflake(emoji, 'id') + emoji = PartialEmoji.with_state(self, animated=emoji.get('animated', False), id=emoji_id, name=emoji['name']) raw = RawReactionActionEvent(data, emoji) self.dispatch('raw_reaction_add', raw) @@ -430,9 +430,9 @@ class ConnectionState: self.dispatch('reaction_clear', message, old_reactions) def parse_message_reaction_remove(self, data): - emoji_data = data['emoji'] - emoji_id = utils._get_as_snowflake(emoji_data, 'id') - emoji = PartialEmoji.with_state(self, animated=emoji_data['animated'], id=emoji_id, name=emoji_data['name']) + emoji = data['emoji'] + emoji_id = utils._get_as_snowflake(emoji, 'id') + emoji = PartialEmoji.with_state(self, animated=emoji.get('animated', False), id=emoji_id, name=emoji['name']) raw = RawReactionActionEvent(data, emoji) self.dispatch('raw_reaction_remove', raw) @@ -893,7 +893,7 @@ class ConnectionState: try: return self._emojis[emoji_id] except KeyError: - return PartialEmoji(animated=data['animated'], id=emoji_id, name=data['name']) + return PartialEmoji(animated=data.get('animated', False), id=emoji_id, name=data['name']) def _upgrade_partial_emoji(self, emoji): emoji_id = emoji.id