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

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

@@ -1,9 +1,9 @@
 includes = ["src/satori/adapters/onebot11"]
-raw-dependencies = ["satori-python-server >= 0.18.0"]
+raw-dependencies = ["satori-python-server<1.4.0,>= 1.3.0"]
 
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.3.3"
+version = "0.4.1"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-onebot11
-Version: 0.3.3
+Version: 0.4.1
 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>
@@ -17,7 +17,7 @@ Classifier: Operating System :: OS Independent
 Project-URL: Homepage, https://github.com/RF-Tar-Railt/satori-python
 Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
 Requires-Python: <4.0,>=3.10
-Requires-Dist: satori-python-server>=0.18.0
+Requires-Dist: satori-python-server<1.4.0,>=1.3.0
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -70,13 +70,13 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           | 路径                                                                 |
-|------------|----------------------------------------------|--------------------------------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
-| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
-| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
-| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket              |
+| 适配器        | 安装                                           | 路径                                                                                   |
+|------------|----------------------------------------------|--------------------------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                                               |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse                   |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                                              |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook, satori.adapters.milky.sse |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
 
 ### 社区适配器
 

{satori_python_adapter_onebot11-0.3.3 → satori_python_adapter_onebot11-0.4.1}/README.md

@@ -48,13 +48,13 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           | 路径                                                                 |
-|------------|----------------------------------------------|--------------------------------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
-| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
-| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
-| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket              |
+| 适配器        | 安装                                           | 路径                                                                                   |
+|------------|----------------------------------------------|--------------------------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                                               |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse                   |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                                              |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook, satori.adapters.milky.sse |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
 
 ### 社区适配器
 

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

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.3.3"
+version = "0.4.1"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python-server >= 0.18.0",
+    "satori-python-server<1.4.0,>= 1.3.0",
 ]
 description = "Satori Protocol SDK for python, adapter for OneBot 11"
 readme = "README.md"

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

@@ -5,13 +5,13 @@ from satori import Api
 from satori.model import (
     Channel,
     ChannelType,
+    Friend,
     Guild,
     Login,
     Member,
     MessageObject,
     PageDequeResult,
     PageResult,
-    Role,
     User,
 )
 from satori.server import Adapter, Request
@@ -35,11 +35,11 @@ from satori.server.route import (
     ReactionCreateParam,
     ReactionDeleteParam,
     UserChannelCreateParam,
-    UserGetParam,
+    UserOpParam,
 )
 
 from .message import OneBot11MessageEncoder, decode
-from .utils import GROUP_AVATAR_URL, USER_AVATAR_URL, OneBotNetwork
+from .utils import GROUP_AVATAR_URL, ROLE_MAPPING, USER_AVATAR_URL, OneBotNetwork
 
 
 def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_getter: Callable[[str], Login]):
@@ -355,7 +355,7 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
             {
                 "group_id": int(request.params["guild_id"]),
                 "user_id": int(request.params["user_id"]),
-                "enable": request.params["role_id"] == "ADMINISTRATOR",
+                "enable": request.params["role_id"] == "admin",
             },
         )
         return
@@ -368,17 +368,17 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
             {
                 "group_id": int(request.params["guild_id"]),
                 "user_id": int(request.params["user_id"]),
-                "enable": request.params["role_id"] != "ADMINISTRATOR",
+                "enable": request.params["role_id"] != "admin",
             },
         )
         return
 
     @adapter.route(Api.GUILD_ROLE_LIST)
     async def guild_role_list(request: Request[GuildXXXListParam]):
-        return PageResult([Role("ADMINISTRATOR", "admin"), Role("MEMBER", "member"), Role("OWNER", "owner")])
+        return PageResult(list(ROLE_MAPPING.values()))
 
     @adapter.route(Api.USER_GET)
-    async def user_get(request: Request[UserGetParam]):
+    async def user_get(request: Request[UserOpParam]):
         net = net_getter(request.self_id)
         result = await net.call_api("get_stranger_info", {"user_id": int(request.params["user_id"])})
         if not result:
@@ -396,11 +396,13 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
         result: list[dict] = await net.call_api("get_friend_list", {})  # type: ignore
         return PageResult(
             [
-                User(
-                    str(item["user_id"]),
-                    item["nickname"],
+                Friend(
+                    User(
+                        str(item["user_id"]),
+                        item["nickname"],
+                        USER_AVATAR_URL.format(uin=item["user_id"]),
+                    ),
                     item.get("remark"),
-                    USER_AVATAR_URL.format(uin=item["user_id"]),
                 )
                 for item in result
             ]
@@ -457,7 +459,7 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
                 "set_msg_emoji_like",
                 {
                     "message_id": int(request.params["message_id"]),
-                    "emoji": request.params["emoji"],
+                    "emoji": request.params["emoji_id"],
                 },
             )
         elif app_name == "Lagrange.OneBot" and not channel_id.startswith("private:"):
@@ -466,7 +468,7 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
                 {
                     "group_id": int(channel_id),
                     "message_id": int(request.params["message_id"]),
-                    "code": request.params["emoji"],
+                    "code": request.params["emoji_id"],
                     "is_add": True,
                 },
             )
@@ -475,18 +477,26 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
                 "set_msg_emoji_like",
                 {
                     "message_id": int(request.params["message_id"]),
-                    "emoji_id": request.params["emoji"],
+                    "emoji_id": request.params["emoji_id"],
                     "set": True,
                 },
             )
         elif app_name == "ws-plugin" and not channel_id.startswith("private:"):
-            emj_type = 1 if int(request.params["emoji"]) < 5000 else 2
+            emoji_id = request.params["emoji_id"]
+            if ":" in emoji_id:
+                # custom emoji, format: {type}:{id}
+                emj_type_str, emj_id_str = emoji_id.split(":", 1)
+                emj_type = int(emj_type_str)
+                emj_id = int(emj_id_str)
+            else:
+                emj_id = int(emoji_id)
+                emj_type = 1 if emj_id < 5000 else 2
             await net.call_api(
                 "set_reaction",
                 {
                     "group_id": int(channel_id),
                     "message_seq": int(request.params["message_id"]),
-                    "code": request.params["emoji"],
+                    "code": emj_id,
                     "is_add": True,
                     "type": emj_type,
                 },
@@ -504,7 +514,7 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
                 "unset_msg_emoji_like",
                 {
                     "message_id": int(request.params["message_id"]),
-                    "emoji": request.params["emoji"],
+                    "emoji": request.params["emoji_id"],
                 },
             )
         elif app_name == "Lagrange.OneBot" and not channel_id.startswith("private:"):
@@ -513,7 +523,7 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
                 {
                     "group_id": int(channel_id),
                     "message_id": int(request.params["message_id"]),
-                    "code": request.params["emoji"],
+                    "code": request.params["emoji_id"],
                     "is_add": False,
                 },
             )
@@ -522,18 +532,26 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
                 "set_msg_emoji_like",
                 {
                     "message_id": int(request.params["message_id"]),
-                    "emoji": request.params["emoji"],
+                    "emoji": request.params["emoji_id"],
                     "set": False,
                 },
             )
         elif app_name == "ws-plugin" and not channel_id.startswith("private:"):
-            emj_type = 1 if int(request.params["emoji"]) < 5000 else 2
+            emoji_id = request.params["emoji_id"]
+            if ":" in emoji_id:
+                # custom emoji, format: {type}:{id}
+                emj_type_str, emj_id_str = emoji_id.split(":", 1)
+                emj_type = int(emj_type_str)
+                emj_id = int(emj_id_str)
+            else:
+                emj_id = int(emoji_id)
+                emj_type = 1 if emj_id < 5000 else 2
             await net.call_api(
                 "set_reaction",
                 {
                     "group_id": int(channel_id),
                     "message_seq": int(request.params["message_id"]),
-                    "code": request.params["emoji"],
+                    "code": emj_id,
                     "is_add": False,
                     "type": emj_type,
                 },

{satori_python_adapter_onebot11-0.3.3 → satori_python_adapter_onebot11-0.4.1}/src/satori/adapters/onebot11/events/message.py

@@ -80,7 +80,9 @@ async def group(login: Login, net: OneBotNetwork, raw: dict):
     member_info = await net.call_api(
         "get_group_member_info", {"group_id": raw["group_id"], "user_id": sender["user_id"]}
     )
-    member = Member(user, member_info["card"], USER_AVATAR_URL.format(uin=sender["user_id"]))
+    member = Member(
+        user, member_info["card"], USER_AVATAR_URL.format(uin=sender["user_id"]), roles=[ROLE_MAPPING[sender["role"]]]
+    )
     guild = Guild(
         str(raw["group_id"]), group_info.get("group_name"), avatar=GROUP_AVATAR_URL.format(group=raw["group_id"])
     )
@@ -93,7 +95,6 @@ async def group(login: Login, net: OneBotNetwork, raw: dict):
         guild=guild,
         channel=channel,
         member=member,
-        role=ROLE_MAPPING[sender["role"]],
         message=MessageObject(str(raw["message_id"]), await decode(raw["message"], net)),
     )
 
@@ -111,7 +112,12 @@ async def group_message_recall(login: Login, net: OneBotNetwork, raw: dict):
         member_info.get("card"),
         USER_AVATAR_URL.format(uin=raw["user_id"]),
     )
-    member = Member(user, member_info.get("card"), USER_AVATAR_URL.format(uin=raw["user_id"]))
+    member = Member(
+        user,
+        member_info.get("card"),
+        USER_AVATAR_URL.format(uin=raw["user_id"]),
+        roles=[ROLE_MAPPING[member_info["role"]]],
+    )
     guild = Guild(
         str(raw["group_id"]), group_info.get("group_name"), avatar=GROUP_AVATAR_URL.format(group=raw["group_id"])
     )
@@ -131,6 +137,5 @@ async def group_message_recall(login: Login, net: OneBotNetwork, raw: dict):
         channel=channel,
         member=member,
         operator=operator,
-        role=ROLE_MAPPING[member_info["role"]],
         message=MessageObject(str(raw["message_id"]), ""),
     )

{satori_python_adapter_onebot11-0.3.3 → satori_python_adapter_onebot11-0.4.1}/src/satori/adapters/onebot11/events/notice.py

@@ -179,8 +179,12 @@ async def group_admin_set(login: Login, net: OneBotNetwork, raw: dict):
     )
     channel = Channel(str(raw["group_id"]), ChannelType.TEXT, group_info.get("group_name"))
     user = User(str(raw["user_id"]), member_info["nickname"], avatar=USER_AVATAR_URL.format(uin=raw["user_id"]))
-    member = Member(user, member_info.get("card"), avatar=USER_AVATAR_URL.format(uin=raw["user_id"]))
-    role = Role("ADMINISTRATOR", "管理员")
+    member = Member(
+        user,
+        member_info.get("card"),
+        avatar=USER_AVATAR_URL.format(uin=raw["user_id"]),
+        roles=[Role("ADMINISTRATOR", "管理员")],
+    )
     return Event(
         EventType.GUILD_MEMBER_UPDATED,
         datetime.now(),
@@ -189,7 +193,6 @@ async def group_admin_set(login: Login, net: OneBotNetwork, raw: dict):
         member=member,
         guild=guild,
         channel=channel,
-        role=role,
     )
 
 
@@ -202,8 +205,12 @@ async def group_admin_unset(login: Login, net: OneBotNetwork, raw: dict):
     )
     channel = Channel(str(raw["group_id"]), ChannelType.TEXT, group_info.get("group_name"))
     user = User(str(raw["user_id"]), member_info["nickname"], avatar=USER_AVATAR_URL.format(uin=raw["user_id"]))
-    member = Member(user, member_info.get("card"), avatar=USER_AVATAR_URL.format(uin=raw["user_id"]))
-    role = Role("MEMBER", "群成员")
+    member = Member(
+        user,
+        member_info.get("card"),
+        avatar=USER_AVATAR_URL.format(uin=raw["user_id"]),
+        roles=[Role("MEMBER", "群成员")],
+    )
     return Event(
         EventType.GUILD_MEMBER_UPDATED,
         datetime.now(),
@@ -212,7 +219,6 @@ async def group_admin_unset(login: Login, net: OneBotNetwork, raw: dict):
         member=member,
         guild=guild,
         channel=channel,
-        role=role,
     )
 
 
@@ -267,7 +273,10 @@ async def member_kick_me(login: Login, net: OneBotNetwork, raw: dict):
         "get_group_member_info", {"group_id": raw["group_id"], "user_id": raw["operator_id"]}
     )
     member = Member(
-        login.user, member_info.get("card", member_info["nickname"]), USER_AVATAR_URL.format(uin=raw["user_id"])
+        login.user,
+        member_info.get("card", member_info["nickname"]),
+        USER_AVATAR_URL.format(uin=raw["user_id"]),
+        roles=[ROLE_MAPPING[member_info["role"]]],
     )
     guild = Guild(
         str(raw["group_id"]), group_info.get("group_name"), avatar=GROUP_AVATAR_URL.format(group=raw["group_id"])
@@ -288,7 +297,6 @@ async def member_kick_me(login: Login, net: OneBotNetwork, raw: dict):
         guild=guild,
         channel=channel,
         operator=operator,
-        role=ROLE_MAPPING[member_info["role"]],
     )
 
 
@@ -303,10 +311,11 @@ async def group_increase(login: Login, net: OneBotNetwork, raw: dict):
             datetime.now(),
             login=login,
             user=login.user,
-            member=Member(login.user, avatar=USER_AVATAR_URL.format(uin=login.user.id)),
+            member=Member(
+                login.user, avatar=USER_AVATAR_URL.format(uin=login.user.id), roles=[Role("MEMBER", "群成员")]
+            ),
             guild=guild,
             channel=channel,
-            role=Role("MEMBER", "群成员"),
         )
     group_info = await net.call_api("get_group_info", {"group_id": raw["group_id"]})
     member_info = await net.call_api("get_group_member_info", {"group_id": raw["group_id"], "user_id": raw["user_id"]})
@@ -319,7 +328,12 @@ async def group_increase(login: Login, net: OneBotNetwork, raw: dict):
         member_info.get("card"),
         USER_AVATAR_URL.format(uin=raw["user_id"]),
     )
-    member = Member(user, member_info.get("card"), USER_AVATAR_URL.format(uin=raw["user_id"]))
+    member = Member(
+        user,
+        member_info.get("card"),
+        USER_AVATAR_URL.format(uin=raw["user_id"]),
+        roles=[ROLE_MAPPING[member_info["role"]]],
+    )
     guild = Guild(
         str(raw["group_id"]), group_info.get("group_name"), avatar=GROUP_AVATAR_URL.format(group=raw["group_id"])
     )
@@ -339,7 +353,6 @@ async def group_increase(login: Login, net: OneBotNetwork, raw: dict):
         guild=guild,
         channel=channel,
         operator=operator,
-        role=Role("MEMBER", "群成员"),
     )
 
 

{satori_python_adapter_onebot11-0.3.3 → satori_python_adapter_onebot11-0.4.1}/src/satori/adapters/onebot11/message.py

@@ -226,8 +226,13 @@ class OneBot11MessageEncoder:
             case "sharp":
                 if "id" in attrs:
                     self.children.append({"type": "text", "data": {"text": attrs["id"]}})
-            case "onebot:face":
-                self.children.append({"type": "face", "data": {"id": int(attrs["id"])}})
+            case "onebot:face" | "emoji":
+                if ":" in attrs["id"]:
+                    _, emj_id_str = attrs["id"].split(":", 1)
+                    emj_id = int(emj_id_str)
+                else:
+                    emj_id = int(attrs["id"])
+                self.children.append({"type": "face", "data": {"id": emj_id}})
             case "a":
                 await self.render(_children)
                 if "href" in attrs:
@@ -317,6 +322,8 @@ async def _decode(content: list[MessageSegment], net: OneBotNetwork) -> list[Ele
                     result.append(E.at_all())
                 else:
                     result.append(E.at(str(qq), name=seg_data.get("name")))
+            case "face":
+                result.append(E.emoji(str(seg_data["id"])))
             case "image":
                 result.append(E.image(seg_data.get("url") or seg_data.get("file")))
             case "record":