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

Implement PartialEmoji == Emoji (fixes #1627)

Browse Source
This commit is contained in:
Ben Mintz 2018-11-15 12:06:35 -06:00 committed by Rapptz
parent 85b5286056
commit ce3ede1551
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
discord/emoji.py
View File

@ -75,6 +75,13 @@ class PartialEmoji(namedtuple('PartialEmoji', 'animated name id')):
return '<a:%s:%s>' % (self.name, self.id) return '<a:%s:%s>' % (self.name, self.id)
return '<:%s:%s>' % (self.name, self.id) return '<:%s:%s>' % (self.name, self.id)
def __eq__(self, other):
if self.is_unicode_emoji():
return isinstance(other, PartialEmoji) and self.name == other.name
if isinstance(other, (PartialEmoji, Emoji)):
return self.id == other.id
def is_custom_emoji(self): def is_custom_emoji(self):
"""Checks if this is a custom non-Unicode emoji.""" """Checks if this is a custom non-Unicode emoji."""
return self.id is not None return self.id is not None
@ -174,6 +181,9 @@ class Emoji(Hashable):
def __repr__(self): def __repr__(self):
return '<Emoji id={0.id} name={0.name!r}>'.format(self) return '<Emoji id={0.id} name={0.name!r}>'.format(self)
def __eq__(self, other):
return isinstance(other, (PartialEmoji, Emoji)) and self.id == other.id
@property @property
def created_at(self): def created_at(self):
"""Returns the emoji's creation time in UTC.""" """Returns the emoji's creation time in UTC."""