From 936f93e98296d4265e828a1bf2fc1432f8268be4 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Thu, 16 Jan 2025 03:50:46 -0500
Subject: [PATCH] Fix broken types

---
 discord/application.py       | 11 +++++++----
 discord/guild.py             |  4 ++--
 discord/http.py              |  2 +-
 discord/state.py             | 12 +++++++++---
 discord/types/application.py |  2 +-
 discord/types/gateway.py     |  1 +
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/discord/application.py b/discord/application.py
index fd264de58..6f6a5c0f3 100644
--- a/discord/application.py
+++ b/discord/application.py
@@ -684,13 +684,13 @@ class ApplicationBot(User):
 
     Attributes
     -----------
-    application: :class:`PartialApplication`
+    application: :class:`Application`
         The application that the bot is attached to.
     """
 
     __slots__ = ('application',)
 
-    def __init__(self, *, data: PartialUserPayload, state: ConnectionState, application: PartialApplication):
+    def __init__(self, *, data: PartialUserPayload, state: ConnectionState, application: Application):
         super().__init__(state=state, data=data)
         self.application = application
 
@@ -1769,6 +1769,9 @@ class _BaseApplication(Hashable):
         self.overlay_compatibility_hook: bool = data.get('overlay_compatibility_hook', False)
         self._overlay_methods: int = data.get('overlay_methods', 0)
 
+    def __str__(self) -> str:
+        return self.name
+
     async def ticket(self) -> str:
         """|coro|
 
@@ -2049,8 +2052,8 @@ class PartialApplication(_BaseApplication):
         owner: Optional[User]
         team: Optional[Team]
 
-    def __str__(self) -> str:
-        return self.name
+    def __init__(self, *, state: ConnectionState, data: PartialApplicationPayload):
+        super().__init__(state=state, data=data)
 
     def _update(self, data: PartialApplicationPayload) -> None:
         super()._update(data)
diff --git a/discord/guild.py b/discord/guild.py
index ba41a950e..226c31825 100644
--- a/discord/guild.py
+++ b/discord/guild.py
@@ -1493,7 +1493,7 @@ class Guild(Hashable):
         self,
         name: str,
         channel_type: Literal[ChannelType.directory],
-        overwrites: Mapping[Union[Role, Member], PermissionOverwrite] = ...,
+        overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
         category: Optional[Snowflake] = ...,
         **options: Any,
     ) -> Coroutine[Any, Any, DirectoryChannelPayload]:
@@ -1941,7 +1941,7 @@ class Guild(Hashable):
         category: Optional[CategoryChannel] = None,
         position: int = MISSING,
         topic: str = MISSING,
-        overwrites: Mapping[Union[Role, Member], PermissionOverwrite] = MISSING,
+        overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = MISSING,
     ) -> DirectoryChannel:
         """|coro|
 
diff --git a/discord/http.py b/discord/http.py
index acf0205da..54c5be5fa 100644
--- a/discord/http.py
+++ b/discord/http.py
@@ -346,7 +346,7 @@ def handle_message_parameters(
         payload.update(channel_payload)
 
     if poll not in (MISSING, None):
-        payload['poll'] = poll._to_dict()  # type: ignore
+        payload['poll'] = poll._to_dict()
 
     # Legacy uploading
     multipart = []
diff --git a/discord/state.py b/discord/state.py
index eab7796f2..7f252c5d3 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -1706,10 +1706,10 @@ class ConnectionState:
         for k, member_data in members.items():
             member = guild.get_member(k)
             if member is not None:
-                member._update(data)
+                member._update(member_data)
             else:
                 if cache_flags.voice:
-                    member = Member(data=member_data, guild=guild, state=self)  # type: ignore # The data is close enough
+                    member = Member(data=member_data, guild=guild, state=self)
                     guild._add_member(member)
 
         for voice_state in data.get('updated_voice_states', []):
@@ -3771,8 +3771,14 @@ class ConnectionState:
                 'name': 'Nitro',
                 'icon': None,
                 'description': '',
-                'verify_key': '93661a9eefe452d12f51e129e8d9340e7ca53a770158c0ec7970e701534b7420',
                 'type': None,
+                'is_monetized': False,
+                'is_verified': False,
+                'is_discoverable': False,
+                'hook': True,
+                'storefront_available': False,
+                'verify_key': '93661a9eefe452d12f51e129e8d9340e7ca53a770158c0ec7970e701534b7420',
+                'flags': 0,
             },
         )
 
diff --git a/discord/types/application.py b/discord/types/application.py
index 31fe36568..4f40ed7d2 100644
--- a/discord/types/application.py
+++ b/discord/types/application.py
@@ -86,7 +86,7 @@ class PartialApplication(BaseApplication, DetectableApplication):
     owner: NotRequired[APIUser]  # Not actually ever present in partial app
     team: NotRequired[Team]
     verify_key: str
-    flags: NotRequired[int]
+    flags: int
     rpc_origins: NotRequired[List[str]]
     terms_of_service_url: NotRequired[str]
     privacy_policy_url: NotRequired[str]
diff --git a/discord/types/gateway.py b/discord/types/gateway.py
index 4806176bf..c30c80b39 100644
--- a/discord/types/gateway.py
+++ b/discord/types/gateway.py
@@ -577,6 +577,7 @@ class PassiveUpdateV1Event(TypedDict):
 
 
 class PassiveUpdateV2Event(TypedDict):
+    guild_id: Snowflake
     removed_voice_states: List[Snowflake]
     updated_channels: List[PartialUpdateChannel]
     members: List[MemberWithUser]