satori-python-adapter-onebot11 0.3.1__tar.gz → 0.3.3__tar.gz

{satori_python_adapter_onebot11-0.3.1 → satori_python_adapter_onebot11-0.3.3}/.mina/adapter_onebot11.toml

@@ -3,7 +3,7 @@ raw-dependencies = ["satori-python-server >= 0.18.0"]
 
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.3.1"
+version = "0.3.3"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_onebot11-0.3.1 → satori_python_adapter_onebot11-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-onebot11
-Version: 0.3.1
+Version: 0.3.3
 Summary: Satori Protocol SDK for python, adapter for OneBot 11
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>

{satori_python_adapter_onebot11-0.3.1 → satori_python_adapter_onebot11-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.3.1"
+version = "0.3.3"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]

{satori_python_adapter_onebot11-0.3.1 → satori_python_adapter_onebot11-0.3.3}/src/satori/adapters/onebot11/api.py

@@ -197,6 +197,18 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
     @adapter.route(Api.CHANNEL_GET)
     async def channel_get(request: Request[ChannelParam]):
         net = net_getter(request.self_id)
+        channel_id = request.params["channel_id"]
+        if channel_id.startswith("private:"):
+            user_id = channel_id.removeprefix("private:")
+            result = await net.call_api("get_stranger_info", {"user_id": int(user_id)})
+            if not result:
+                raise RuntimeError(f"Failed to get user {user_id}")
+            return Channel(
+                f"private:{user_id}",
+                ChannelType.DIRECT,
+                result["nickname"],
+                USER_AVATAR_URL.format(uin=user_id),
+            )
         result = await net.call_api("get_group_info", {"group_id": int(request.params["channel_id"])})
         if not result:
             raise RuntimeError(f"Failed to get group {request.params['channel_id']}")
@@ -223,18 +235,18 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
     @adapter.route(Api.CHANNEL_LIST)
     async def channel_list(request: Request[ChannelListParam]):
         net = net_getter(request.self_id)
-        result: list[dict] = await net.call_api("get_group_list", {})  # type: ignore
-        return PageResult(
-            [
-                Channel(
-                    str(item["group_id"]),
-                    ChannelType.TEXT,
-                    item["group_name"],
-                    GROUP_AVATAR_URL.format(group=item["group_id"]),
-                )
-                for item in result
-            ]
-        )
+        result = await net.call_api("get_group_info", {"group_id": int(request.params["guild_id"])})
+        if not result:
+            raise RuntimeError(f"Failed to get group {request.params['guild_id']}")
+        channels = [
+            Channel(
+                str(result["group_id"]),
+                ChannelType.TEXT,
+                result["group_name"],
+                GROUP_AVATAR_URL.format(group=result["group_id"]),
+            )
+        ]
+        return PageResult(channels)
 
     @adapter.route(Api.GUILD_LIST)
     async def guild_list(request: Request[GuildListParam]):
@@ -250,6 +262,8 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
     @adapter.route(Api.CHANNEL_UPDATE)
     async def channel_update(request: Request[ChannelUpdateParam]):
         net = net_getter(request.self_id)
+        if request.params["channel_id"].startswith("private:"):
+            raise RuntimeError("Cannot update private channel")
         await net.call_api(
             "set_group_name",
             {"group_id": int(request.params["channel_id"]), "group_name": request.params["data"]["name"]},
@@ -259,6 +273,8 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
     @adapter.route(Api.CHANNEL_MUTE)
     async def channel_mute(request: Request[ChannelMuteParam]):
         net = net_getter(request.self_id)
+        if request.params["channel_id"].startswith("private:"):
+            raise RuntimeError("Cannot mute private channel")
         await net.call_api(
             "set_group_whole_ban",
             {

{satori_python_adapter_onebot11-0.3.1 → satori_python_adapter_onebot11-0.3.3}/src/satori/adapters/onebot11/forward.py

@@ -156,7 +156,7 @@ class OneBot11ForwardAdapter(BaseAdapter):
                     if (access_token := self.access_token) is not None
                     else None
                 ),
-                timeout=self.timeout
+                timeout=self.timeout,
             )
             try:
                 self.connection = await ctx.__aenter__()

{satori_python_adapter_onebot11-0.3.1 → satori_python_adapter_onebot11-0.3.3}/src/satori/adapters/onebot11/reverse.py

@@ -34,7 +34,6 @@ class _Connection:
 
         while True:
             message = await self.ws.receive()
-            print(message)
 
             if message["type"] == "websocket.disconnect":
                 break