From 17878673203235f6aa9ddc797abda56ce23df2e6 Mon Sep 17 00:00:00 2001
From: Josh <josh.ja.butt@gmail.com>
Date: Sun, 7 Aug 2022 04:23:37 +1000
Subject: [PATCH] Add support for specifying the type of a generic
 discord.Object

Co-authored-by: Danny <1695103+Rapptz@users.noreply.github.com>
---
 discord/mixins.py |  7 ++-----
 discord/object.py | 28 +++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/discord/mixins.py b/discord/mixins.py
index 9556f9d90..677575d4c 100644
--- a/discord/mixins.py
+++ b/discord/mixins.py
@@ -34,12 +34,9 @@ class EqualityComparable:
     id: int
 
     def __eq__(self, other: object) -> bool:
-        return isinstance(other, self.__class__) and other.id == self.id
-
-    def __ne__(self, other: object) -> bool:
         if isinstance(other, self.__class__):
-            return other.id != self.id
-        return True
+            return other.id == self.id
+        return NotImplemented
 
 
 class Hashable(EqualityComparable):
diff --git a/discord/object.py b/discord/object.py
index b48b847e5..bf08b0f7d 100644
--- a/discord/object.py
+++ b/discord/object.py
@@ -25,16 +25,18 @@ DEALINGS IN THE SOFTWARE.
 from __future__ import annotations
 
 from .mixins import Hashable
-from .utils import snowflake_time
+from .utils import snowflake_time, MISSING
 
 from typing import (
     SupportsInt,
     TYPE_CHECKING,
+    Type,
     Union,
 )
 
 if TYPE_CHECKING:
     import datetime
+    from . import abc
 
     SupportsIntCast = Union[SupportsInt, str, bytes, bytearray]
 
@@ -77,18 +79,34 @@ class Object(Hashable):
     -----------
     id: :class:`int`
         The ID of the object.
+    type: Type[:class:`abc.Snowflake`]
+        The discord.py model type of the object, if not specified, defaults to this class.
+
+        .. note::
+
+            In instances where there are multiple applicable types, use a shared base class.
+            for example, both :class:`Member` and :class:`User` are subclasses of :class:`abc.User`.
+
+        .. versionadded:: 2.0
     """
 
-    def __init__(self, id: SupportsIntCast):
+    def __init__(self, id: SupportsIntCast, *, type: Type[abc.Snowflake] = MISSING):
         try:
             id = int(id)
         except ValueError:
             raise TypeError(f'id parameter must be convertible to int not {id.__class__!r}') from None
-        else:
-            self.id = id
+        self.id: int = id
+        self.type: Type[abc.Snowflake] = type or self.__class__
 
     def __repr__(self) -> str:
-        return f'<Object id={self.id!r}>'
+        return f'<Object id={self.id!r} type={self.type!r}>'
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, self.type):
+            return self.id == other.id
+        return NotImplemented
+
+    __hash__ = Hashable.__hash__
 
     @property
     def created_at(self) -> datetime.datetime: