Add missing types

dolfies · Sep 10, 2023 · fd240be · fd240be
1 parent eaec0ce
commit fd240be
Show file tree

Hide file tree

Showing 22 changed files with 605 additions and 327 deletions.
diff --git a/discord/abc.py b/discord/abc.py
@@ -262,7 +262,7 @@ async def _handle_commands(
         prev_cursor = cursor
         cursor = data['cursor'].get('next')
         cmds = data['application_commands']
-        apps: Dict[int, dict] = {int(app['id']): app for app in data.get('applications') or []}
+        apps = {int(app['id']): app for app in data.get('applications') or []}
 
         for cmd in cmds:
             # Handle faked parameters
@@ -280,8 +280,10 @@ async def _handle_commands(
             except ValueError:
                 pass
 
-            cmd['application'] = apps.get(int(cmd['application_id']))
-            yield cls(state=state, data=cmd, channel=channel, target=target)
+            application_data = apps.get(int(cmd['application_id']))
+            application = state.create_integration_application(application_data) if application_data else None
+
+            yield cls(state=state, data=cmd, channel=channel, target=target, application=application)
 
         cmd_ids = None
         if application_id or len(cmds) < min(limit if limit else 25, 25) or len(cmds) == limit == 25:

diff --git a/discord/calls.py b/discord/calls.py
@@ -24,7 +24,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import Callable, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Tuple, Union
 
 from . import utils
 from .errors import ClientException
@@ -39,6 +39,7 @@
     from .member import VoiceState
     from .message import Message
     from .state import ConnectionState
+    from .types.gateway import CallCreateEvent, CallUpdateEvent
     from .user import BaseUser, User
 
     _PrivateChannel = Union[abc.DMChannel, abc.GroupChannel]
@@ -144,7 +145,7 @@ class PrivateCall:
     def __init__(
         self,
         *,
-        data: dict,
+        data: Union[CallCreateEvent, CallUpdateEvent],
         state: ConnectionState,
         message: Optional[Message],
         channel: abc.PrivateChannel,
@@ -153,7 +154,6 @@ def __init__(
         self._cs_message = message
         self.channel = channel  # type: ignore # Will always be a DMChannel here
         self._ended: bool = False
-
         self._update(data)
 
     def _delete(self) -> None:
@@ -168,7 +168,7 @@ def _is_participating(self, user: BaseUser) -> bool:
         state = self.voice_state_for(user)
         return bool(state and state.channel and state.channel.id == self.channel.id)
 
-    def _update(self, data) -> None:
+    def _update(self, data: Union[CallCreateEvent, CallUpdateEvent]) -> None:
         self._message_id = int(data['message_id'])
         self.unavailable = data.get('unavailable', False)
         try:
@@ -179,7 +179,7 @@ def _update(self, data) -> None:
         channel = self.channel
         recipients = self._get_recipients()
         lookup = {u.id: u for u in recipients}
-        self._ringing = tuple(filter(None, map(lookup.get, data.get('ringing', []))))
+        self._ringing = tuple(filter(None, map(lookup.get, [int(x) for x in data.get('ringing', [])])))
 
         for vs in data.get('voice_states', []):
             self._state._update_voice_state(vs, channel.id)