db stuff again

Author: Motzumoto

discord/client.py

@@ -339,16 +339,8 @@ async def __aexit__(
     def _get_websocket(self, guild_id: Optional[int] = None, *, shard_id: Optional[int] = None) -> DiscordWebSocket:
         return self.ws
 
-    def _get_state(self, **options: Any) -> ConnectionState:
-        state = ConnectionState(
-            dispatch=self.dispatch,
-            handlers=self._handlers,
-            hooks=self._hooks,
-            http=self.http,
-            **options
-        )
-        state.database = getattr(self, "db", None)
-        return state
+    def _get_state(self, **options: Any) -> ConnectionState[DatabaseT, Self]:
+        return ConnectionState(dispatch=self.dispatch, handlers=self._handlers, hooks=self._hooks, http=self.http, **options)
 
     def _handle_ready(self) -> None:
         self._ready.set()

discord/state.py

@@ -184,6 +184,7 @@ def __init__(
         handlers: Dict[str, Callable[..., Any]],
         hooks: Dict[str, Callable[..., Coroutine[Any, Any, Any]]],
         http: HTTPClient,
+        database: DatabaseT = None,
         **options: Any,
     ) -> None:
         # Set later, after Client.login
@@ -200,7 +201,7 @@ def __init__(
         self._ready_task: Optional[asyncio.Task] = None
         self.application_id: Optional[int] = utils._get_as_snowflake(options, 'application_id')
         self.application_flags: ApplicationFlags = utils.MISSING
-        self.database: DatabaseT = None
+        self.database: DatabaseT = database
         self.heartbeat_timeout: float = options.get('heartbeat_timeout', 60.0)
         self.guild_ready_timeout: float = options.get('guild_ready_timeout', 2.0)
         if self.guild_ready_timeout < 0: