feat!: Add a guild id property for the member object (#1025)

* feat!: Add a guild id property for the member object

* Update interactions/api/models/member.py

Co-authored-by: Max <maxyolo01.ytb@gmail.com>

* ci: correct from checks.

* ref: use self._extras

* ci: correct from checks.

* ref: raise an exception when not present

* ci: correct from checks.

* Update gw.py

* Update member.py

* feat: ensure a guild_id in _extras whenever possible

Co-authored-by: Max <maxyolo01.ytb@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

interactions/api/http/member.py

@@ -35,7 +35,7 @@ async def get_member(self, guild_id: int, member_id: int) -> Optional[dict]:
             )
         )
 
-        member = Member(**res, _client=self)
+        member = Member(**res, _client=self, guild_id=Snowflake(guild_id))
         guild = self.cache[Guild].get(Snowflake(guild_id))
         if guild.members is None:
             guild.members = [member]
@@ -68,9 +68,13 @@ async def get_list_of_members(
         res = await self._req.request(Route("GET", f"/guilds/{guild_id}/members"), params=payload)
         guild = self.cache[Guild].get(Snowflake(guild_id))
         if guild.members is None:
-            guild.members = [Member(**_res, _client=self) for _res in res]
+            guild.members = [
+                Member(**_res, _client=self, guild_id=Snowflake(guild_id)) for _res in res
+            ]
         else:
-            for member in [Member(**_res, _client=self) for _res in res]:
+            for member in [
+                Member(**_res, _client=self, guild_id=Snowflake(guild_id)) for _res in res
+            ]:
                 for index, _member in enumerate(guild.members):
                     if _member.id == member.id:
                         guild.members[index] = member

interactions/api/models/guild.py

@@ -361,6 +361,11 @@ def __attrs_post_init__(self):  # sourcery skip: last-if-guard
                 if not self.presences:
                     self.presences = guild.presences
 
+        if self.members:
+            for member in self.members:
+                if not member._extras.get("guild_id"):
+                    member._extras["guild_id"] = self.id
+
     def __repr__(self) -> str:
         return self.name
 
@@ -578,7 +583,7 @@ async def get_member(
             guild_id=int(self.id),
             member_id=int(member_id),
         )
-        member = Member(**res, _client=self._client)
+        member = Member(**res, _client=self._client, guild_id=self.id)
         if self.members is None:
             self.members = []
         for index, _member in enumerate(self.members):
@@ -1098,7 +1103,7 @@ async def modify_member(
             reason=reason,
         )
 
-        _member = Member(**res, _client=self._client)
+        _member = Member(**res, _client=self._client, guild_id=self.id)
         if self.members is None:
             self.members = []
         for index, member in enumerate(self.members):
@@ -2038,7 +2043,7 @@ async def get_list_of_members(
         res = await self._client.get_list_of_members(
             guild_id=int(self.id), limit=limit, after=_after
         )
-        _members = [Member(**member, _client=self._client) for member in res]
+        _members = [Member(**member, _client=self._client, guild_id=self.id) for member in res]
         if self.members is None:
             self.members = []
         for member in _members:
@@ -2062,7 +2067,7 @@ async def search_members(self, query: str, limit: Optional[int] = 1) -> List[Mem
         res = await self._client.search_guild_members(
             guild_id=int(self.id), query=query, limit=limit
         )
-        return [Member(**member, _client=self._client) for member in res]
+        return [Member(**member, _client=self._client, guild_id=self.id) for member in res]
 
     async def get_all_members(self) -> List[Member]:
         """
@@ -2089,7 +2094,7 @@ async def get_all_members(self) -> List[Member]:
                     guild_id=int(self.id), limit=100, after=int(_last_member.id)
                 )
         _all_members.extend(_members)
-        self.members = [Member(**_, _client=self._client) for _ in _all_members]
+        self.members = [Member(**_, _client=self._client, guild_id=self.id) for _ in _all_members]
         return self.members
 
     async def get_webhooks(self) -> List[Webhook]: