aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2017-07-02 01:40:13 -0400
committerRapptz <[email protected]>2017-07-02 01:40:13 -0400
commitf607febaf7a01e210dd458049ed766ee9416fa42 (patch)
tree40a15a5c4624b0ff570e2a449d7e3e1a6d5f805b
parentBump requirements to aiohttp 2.2 and PyNaCl 1.1.2 (diff)
downloaddiscord.py-f607febaf7a01e210dd458049ed766ee9416fa42.tar.xz
discord.py-f607febaf7a01e210dd458049ed766ee9416fa42.zip
Fix Message.remove_reaction and Message.add_reaction taking in Reaction
-rw-r--r--discord/message.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/discord/message.py b/discord/message.py
index 39f1d599..d321663f 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -609,8 +609,9 @@ class Message:
"""
if isinstance(emoji, Reaction):
- emoji = str(emoji.emoji)
- elif isinstance(emoji, Emoji):
+ emoji = emoji.emoji
+
+ if isinstance(emoji, Emoji):
emoji = '%s:%s' % (emoji.name, emoji.id)
elif isinstance(emoji, str):
pass # this is okay
@@ -653,8 +654,9 @@ class Message:
"""
if isinstance(emoji, Reaction):
- emoji = str(emoji.emoji)
- elif isinstance(emoji, Emoji):
+ emoji = emoji.emoji
+
+ if isinstance(emoji, Emoji):
emoji = '%s:%s' % (emoji.name, emoji.id)
elif isinstance(emoji, str):
pass # this is okay