conflict fix

This commit is contained in:
iDutchy
2020-10-28 21:00:48 -05:00
33 changed files with 12183 additions and 3671 deletions

View File

@@ -42,6 +42,7 @@ from .flags import MessageFlags
from .file import File
from .utils import escape_mentions
from .guild import Guild
from .mixins import Hashable
class Attachment:
@@ -255,7 +256,7 @@ def flatten_handlers(cls):
return cls
@flatten_handlers
class Message:
class Message(Hashable):
r"""Represents a message from Discord.
There should be no need to create one of these manually.
@@ -397,9 +398,6 @@ class Message:
def __repr__(self):
return '<Message id={0.id} channel={0.channel!r} type={0.type!r} author={0.author!r} flags={0.flags!r}>'.format(self)
def __eq__(self, other):
return isinstance(other, self.__class__) and self.id == other.id
def _try_patch(self, data, key, transform=None):
try:
value = data[key]