Fix User == Member comparisons.

discord/member.py

@@ -107,7 +107,7 @@ def flatten_user(cls):
     return cls
 
 @flatten_user
-class Member(discord.abc.Messageable):
+class Member(discord.abc.Messageable, discord.abc.User):
     """Represents a Discord member to a :class:`Guild`.
 
     This implements a lot of the functionality of :class:`User`.
@@ -170,7 +170,7 @@ class Member(discord.abc.Messageable):
                ' bot={1.bot} nick={0.nick!r} guild={0.guild!r}>'.format(self, self._user)
 
     def __eq__(self, other):
-        return isinstance(other, (BaseUser, Member)) and other.id == self.id
+        return isinstance(other, discord.abc.User) and other.id == self.id
 
     def __ne__(self, other):
         return not self.__eq__(other)

discord/user.py

@@ -35,7 +35,7 @@ import asyncio
 
 Profile = namedtuple('Profile', 'premium user mutual_guilds connected_accounts premium_since')
 
-class BaseUser:
+class BaseUser(discord.abc.User):
     __slots__ = ('name', 'id', 'discriminator', 'avatar', 'bot', '_state')
 
     def __init__(self, *, state, data):
@@ -50,7 +50,7 @@ class BaseUser:
         return '{0.name}#{0.discriminator}'.format(self)
 
     def __eq__(self, other):
-        return isinstance(other, BaseUser) and other.id == self.id
+        return isinstance(other, discord.abc.User) and other.id == self.id
 
     def __ne__(self, other):
         return not self.__eq__(other)