matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Allow using Reaction objects while adding or removing reactions.

Browse Source
This commit is contained in:
Rapptz 2017-04-21 17:31:13 -04:00
parent 83649d7f0a
commit b05d8790fc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
discord/message.py
View File

@ -520,7 +520,7 @@ class Message:
Parameters Parameters
------------ ------------
emoji: :class:`Emoji` or str emoji: Union[:class:`Emoji`, :class:`Reaction`, str]
The emoji to react with. The emoji to react with.
Raises Raises
@ -535,12 +535,14 @@ class Message:
The emoji parameter is invalid. The emoji parameter is invalid.
""" """
if isinstance(emoji, Emoji): if isinstance(emoji, Reaction):
emoji = str(emoji.emoji)
elif isinstance(emoji, Emoji):
emoji = '%s:%s' % (emoji.name, emoji.id) emoji = '%s:%s' % (emoji.name, emoji.id)
elif isinstance(emoji, str): elif isinstance(emoji, str):
pass # this is okay pass # this is okay
else: else:
raise InvalidArgument('emoji argument must be a string or discord.Emoji') raise InvalidArgument('emoji argument must be str, Emoji, or Reaction not {.__class__.__name__}.'.format(emoji))
yield from self._state.http.add_reaction(self.id, self.channel.id, emoji) yield from self._state.http.add_reaction(self.id, self.channel.id, emoji)
@ -560,7 +562,7 @@ class Message:
Parameters Parameters
------------ ------------
emoji: :class:`Emoji` or str emoji: Union[:class:`Emoji`, :class:`Reaction`, str]
The emoji to remove. The emoji to remove.
member: :class:`abc.Snowflake` member: :class:`abc.Snowflake`
The member for which to remove the reaction. The member for which to remove the reaction.
@ -577,12 +579,14 @@ class Message:
The emoji parameter is invalid. The emoji parameter is invalid.
""" """
if isinstance(emoji, Emoji): if isinstance(emoji, Reaction):
emoji = str(emoji.emoji)
elif isinstance(emoji, Emoji):
emoji = '%s:%s' % (emoji.name, emoji.id) emoji = '%s:%s' % (emoji.name, emoji.id)
elif isinstance(emoji, str): elif isinstance(emoji, str):
pass # this is okay pass # this is okay
else: else:
raise InvalidArgument('emoji argument must be a string or discord.Emoji') raise InvalidArgument('emoji argument must be str, Emoji, or Reaction not {.__class__.__name__}.'.format(emoji))
yield from self._state.http.remove_reaction(self.id, self.channel.id, emoji, member.id) yield from self._state.http.remove_reaction(self.id, self.channel.id, emoji, member.id)