Merge branch 'unstable' into fix/guild-chunch_cache

Author: silasary

.github/dependabot.yml

@@ -1,6 +1,7 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions" # See documentation for possible values
+    target-branch: "unstable"
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"

.github/workflows/docs.yml

@@ -19,7 +19,6 @@ jobs:
           key: ${{ github.ref }}
           path: .cache
       - run: pip install -e .[docs]
-      - run: pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
       - run: mkdocs gh-deploy
 env:
   GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/pytest-push.yml

@@ -18,10 +18,10 @@ jobs:
         include:
           - extras: .[all]
             python-version: "3.10"
-            RUN_TESTBOT: true
+            #RUN_TESTBOT: true
           - extras: .[all]
             python-version: "3.11"
-            RUN_TESTBOT: true
+            #RUN_TESTBOT: true
 
     steps:
       - uses: actions/checkout@v4

interactions/api/gateway/gateway.py

@@ -158,6 +158,10 @@ async def run(self) -> None:
             seq = msg.get("s")
             event = msg.get("t")
 
+            if op == MISSING:
+                # Internal no-op, ignore it.
+                continue
+
             if seq:
                 self.sequence = seq
 

interactions/api/gateway/websocket.py

@@ -164,7 +164,7 @@ async def send_json(self, data: dict, bypass=False) -> None:
         serialized = FastJson.dumps(data)
         await self.send(serialized, bypass)
 
-    async def receive(self, force: bool = False) -> str:  # noqa: C901
+    async def receive(self, force: bool = False) -> dict:  # noqa: C901
         """
         Receive a full event payload from the WebSocket.
 
@@ -208,6 +208,14 @@ async def receive(self, force: bool = False) -> str:  # noqa: C901
                     # is possible after all we can just wait for the event to be set.
                     await self._closed.wait()
                 else:
+                    if self.state.client.http.closed:
+                        # On aiohttp>=3.12.4, the aiohttp WebSocket client will always send a session
+                        # close message when the underlying HTTP connection is closed. We want to
+                        # ignore this to keep the behavior consistent with previous versions
+                        # of Python, so we return this to indicate that no message was received.
+                        # https://github.com/interactions-py/interactions.py/issues/1778
+                        return {"op": const.MISSING}
+
                     # This is an odd corner-case where the underlying socket connection was closed
                     # unexpectedly without communicating the WebSocket closing handshake. We'll have
                     # to reconnect ourselves.

interactions/api/http/http_client.py

@@ -250,6 +250,17 @@ def __init__(
             logger = constants.get_logger()
         self.logger = logger
 
+    @property
+    def closed(self) -> bool:
+        """
+        Returns whether the session is closed.
+
+        Returns:
+            True if the session is closed, False otherwise.
+
+        """
+        return self.__session is None or self.__session.closed
+
     def get_ratelimit(self, route: Route) -> BucketLock:
         """
         Get a route's rate limit bucket.

interactions/ext/hybrid_commands/hybrid_slash.py

@@ -134,7 +134,7 @@ def __init__(
 
     async def convert(self, ctx: BaseContext, argument: str) -> float | int:
         try:
-            converted: float | int = await maybe_coroutine(self.number_convert, ctx, argument)
+            converted: float | int = await maybe_coroutine(self.number_convert, argument)
 
             if self.min_value and converted < self.min_value:
                 raise BadArgument(f'Value "{argument}" is less than {self.min_value}.')