aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2017-06-09 22:01:31 -0400
committerRapptz <[email protected]>2017-06-09 22:01:31 -0400
commitc1dad43f9d43b1a83a5b72f88b46cb435f256f30 (patch)
treef48a891e7c64deaf2e17487da54d78ad5d983a04
parentDefer logging formatting until the logger is actually called. (diff)
downloaddiscord.py-c1dad43f9d43b1a83a5b72f88b46cb435f256f30.tar.xz
discord.py-c1dad43f9d43b1a83a5b72f88b46cb435f256f30.zip
Downgrade PartialReactionEmoji to str in non-raw reaction events.
-rw-r--r--discord/state.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/discord/state.py b/discord/state.py
index 7ff05b3b..79054bee 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -826,8 +826,11 @@ class ConnectionState:
return PartialReactionEmoji(id=emoji_id, name=data['name'])
def _upgrade_partial_emoji(self, emoji):
+ emoji_id = emoji.id
+ if not emoji_id:
+ return emoji.name
try:
- return self._emojis[emoji.id]
+ return self._emojis[emoji_id]
except KeyError:
return emoji