satori-python-adapter-qq 0.3.2__tar.gz → 0.4.0rc1__tar.gz

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/.mina/adapter_qq.toml

@@ -6,7 +6,7 @@ raw-dependencies = [
 
 [project]
 name = "satori-python-adapter-qq"
-version = "0.3.2"
+version = "0.4.0-rc1"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-qq
-Version: 0.3.2
+Version: 0.4.0rc1
 Summary: Satori Protocol SDK for python, adapter for QQ
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/pyproject.toml

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

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/src/satori/adapters/qq/api.py

@@ -29,7 +29,7 @@ from satori.server.route import (
 )
 
 from .message import QQGroupMessageEncoder, QQGuildMessageEncoder, decode_segments
-from .utils import ROLE_MAPPING, QQBotNetwork, decode_channel, decode_guild, decode_member, decode_user
+from .utils import ROLE_MAPPING, USER_AVATAR_URL, QQBotNetwork, decode_channel, decode_guild, decode_member, decode_user
 
 
 def apply(
@@ -141,7 +141,14 @@ def apply(
                 )
                 return decode_user(res)
             raise NotFoundException("qqguild platform does not support user.get without guild_id")
-        raise NotFoundException("qq platform does not support user.get")
+        # raise NotFoundException("qq platform does not support user.get")
+        app_id = net.bot_id_mapping[login_getter(request.self_id, request.platform == "qqguild").id]
+        return decode_user(
+            {
+                "id": request.params["user_id"],
+                "avatar": USER_AVATAR_URL.format(app_id=app_id, user_id=request.params["user_id"]),
+            }
+        )
 
     @adapter.route(Api.GUILD_GET)
     async def guild_get(request: Request[GuildGetParam]):
@@ -152,7 +159,8 @@ def apply(
                 f"guilds/{request.params['guild_id']}",
             )
             return decode_guild(res)
-        raise NotFoundException("qq platform does not support guild.get")
+        # raise NotFoundException("qq platform does not support guild.get")
+        return Guild(request.params["guild_id"])  # type: ignore
 
     @adapter.route(Api.GUILD_LIST)
     async def guild_list(request: Request[GuildListParam]):
@@ -177,7 +185,9 @@ def apply(
                 f"channels/{channel_id}",
             )
             return decode_channel(res)
-        raise NotFoundException("qq platform does not support channel.get")
+        # raise NotFoundException("qq platform does not support channel.get")
+        is_private = request.params["channel_id"].startswith("private:")
+        return Channel(request.params["channel_id"], ChannelType.DIRECT if is_private else ChannelType.TEXT)  # type: ignore
 
     @adapter.route(Api.CHANNEL_LIST)
     async def channel_list(request: Request[ChannelListParam]):
@@ -253,7 +263,18 @@ def apply(
                 f"guilds/{guild_id}/members/{request.params['user_id']}",
             )
             return decode_member(res)
-        raise NotFoundException("qq platform does not support guild.member.get")
+        # raise NotFoundException("qq platform does not support guild.member.get")
+        app_id = net.bot_id_mapping[login_getter(request.self_id, request.platform == "qqguild").id]
+        return Member(
+            decode_user(
+                {
+                    "id": request.params["user_id"],
+                    "avatar": USER_AVATAR_URL.format(app_id=app_id, user_id=request.params["user_id"]),
+                }
+            ),
+            joined_at=None,
+            roles=[ROLE_MAPPING["1"]],
+        )
 
     @adapter.route(Api.GUILD_MEMBER_LIST)
     async def guild_list_member(request: Request[GuildXXXListParam]):

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/src/satori/adapters/qq/events/group.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from satori import EventType
 from satori.model import Channel, ChannelType, Event, Guild, User
 
-from ..utils import Payload
+from ..utils import USER_AVATAR_URL, Payload
 from .base import register_event
 
 
@@ -17,7 +17,8 @@ async def friend_event(login, guild_login, net, payload: Payload):
         "FRIEND_ADD": EventType.FRIEND_ADDED,
         "FRIEND_DEL": EventType.FRIEND_REMOVED,
     }[payload.type or ""]
-    user = User(raw["openid"])
+    app_id = net.bot_id_mapping[login.id]
+    user = User(raw["openid"], avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["openid"]))
     return Event(
         t,
         (
@@ -40,7 +41,10 @@ async def group_event(login, guild_login, net, payload: Payload):
         guild = Guild(raw["group_openid"])
     else:
         guild = Guild(raw["guild_id"])
-    operator = User(raw["op_member_openid"])
+    app_id = net.bot_id_mapping[login.id]
+    operator = User(
+        raw["op_member_openid"], avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["op_member_openid"])
+    )
     t = {
         "GROUP_ADD_ROBOT": EventType.GUILD_ADDED,
         "GROUP_DEL_ROBOT": EventType.GUILD_REMOVED,

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/src/satori/adapters/qq/events/message.py

@@ -82,6 +82,62 @@ async def direct_message_create(login, guild_login, net, payload: Payload):
     )
 
 
+@register_event("GROUP_MESSAGE_CREATE")
+async def group_message_create(login, guild_login, net, payload: Payload):
+    raw = payload.data
+    if "group_openid" in raw:
+        channel = Channel(raw["group_openid"], ChannelType.TEXT)
+    else:
+        channel = Channel(raw["group_id"], ChannelType.TEXT)
+    app_id = net.bot_id_mapping[login.id]
+    name = raw["author"].get("username")
+    if "member_openid" in raw["author"]:
+        user = User(
+            raw["author"]["member_openid"],
+            name=name,
+            avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["member_openid"]),
+            is_bot=raw["author"].get("bot", False),
+        )
+    else:
+        user = User(
+            raw["author"]["id"],
+            name=name,
+            avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["id"]),
+            is_bot=raw["author"].get("bot", False),
+        )
+    member = Member(user, avatar=user.avatar)
+    msg = decode_segments(raw)
+    if msg and isinstance(elem := msg[0], At) and elem.id == "all" and isinstance(msg[1], Text):
+        text = msg[1].text.lstrip()
+        if not text:
+            msg.pop(1)
+        else:
+            msg[1] = Text(text)
+    for mention in reversed(raw["mentions"]):
+        if mention["scope"] == "all":
+            continue
+        msg.insert(0, At(mention["id"], name=mention.get("username")))
+    return Event(
+        EventType.MESSAGE_CREATED,
+        (
+            datetime.fromtimestamp(int(raw["timestamp"]))
+            if isinstance(raw["timestamp"], (int, float)) or raw["timestamp"].isdigit()
+            else datetime.fromisoformat(str(raw["timestamp"]))
+        ),
+        login,
+        channel=channel,
+        guild=Guild(channel.id),
+        member=member,
+        user=user,
+        message=MessageObject.from_elements(raw["id"], msg),
+        referrer={
+            "msg_id": raw["id"],
+            "msg_seq": -1,
+            "msg_scene": raw["message_scene"],
+        },
+    )
+
+
 @register_event("GROUP_AT_MESSAGE_CREATE")
 async def group_at_message_create(login, guild_login, net, payload: Payload):
     raw = payload.data
@@ -96,10 +152,14 @@ async def group_at_message_create(login, guild_login, net, payload: Payload):
             raw["author"]["member_openid"],
             name=name,
             avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["member_openid"]),
+            is_bot=raw["author"].get("bot", False),
         )
     else:
         user = User(
-            raw["author"]["id"], name=name, avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["id"])
+            raw["author"]["id"],
+            name=name,
+            avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["id"]),
+            is_bot=raw["author"].get("bot", False),
         )
     member = Member(user, avatar=user.avatar)
     msg = decode_segments(raw)
@@ -141,10 +201,14 @@ async def c2c_message_create(login, guild_login, net, payload: Payload):
             raw["author"]["user_openid"],
             name,
             avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["user_openid"]),
+            is_bot=raw["author"].get("bot"),
         )
     else:
         user = User(
-            raw["author"]["id"], name, avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["id"])
+            raw["author"]["id"],
+            name,
+            avatar=USER_AVATAR_URL.format(app_id=app_id, user_id=raw["author"]["id"]),
+            is_bot=raw["author"].get("bot"),
         )
     channel = Channel(f"private:{user.id}", ChannelType.DIRECT)
     return Event(

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/src/satori/adapters/qq/message.py

@@ -21,6 +21,17 @@ from .utils import QQBotNetwork, parse_file_uri
 
 _BASE64_RE = re.compile(r"^data:([\w/.+-]+);base64,")
 MAX_FILESIZE_ONCE = 10 * 1024 * 1024  # 10MB
+BUTTON_STYLES = {
+    "grey": 0,
+    "secondary": 0,
+    "blue": 1,
+    "primary": 1,
+    "success": 1,
+    "info": 2,
+    "warning": 3,
+    "danger": 3,
+    "link": 4,
+}
 
 
 def escape(s: str) -> str:
@@ -530,7 +541,7 @@ class QQGroupMessageEncoder(QQBotMessageEncoder):
             "render_data": {
                 "label": label,
                 "visited_label": label,
-                "style": 1 if attrs.get("class") == "primary" else 0,
+                "style": BUTTON_STYLES.get(attrs.get("class", "grey"), 1),
             },
             "action": {
                 "type": {"input": 2, "link": 0}.get(attrs.get("type", "action"), 1),
@@ -586,7 +597,10 @@ def decode_segments(event: dict) -> list[Element]:
             if seg_type == "text":
                 result.append(E.text(i["text"]))
             elif seg_type == "mention_user":
-                result.append(E.at(i["user_id"]))
+                if i["user_id"] == "all":
+                    result.append(E.at_all())
+                else:
+                    result.append(E.at(i["user_id"]))
             elif seg_type == "mention_channel":
                 result.append(E.sharp(i["channel_id"]))
             elif seg_type == "emoji":

{satori_python_adapter_qq-0.3.2 → satori_python_adapter_qq-0.4.0rc1}/src/satori/adapters/qq/utils.py

@@ -18,6 +18,9 @@ CallMethod = Literal["get", "post", "fetch", "update", "multipart", "put", "dele
 class QQBotNetwork(Protocol):
     session: ClientSession
 
+    @property
+    def bot_id_mapping(self) -> dict[str, str]: ...
+
     async def call_api(self, method: CallMethod, action: str, params: dict | None = None) -> dict: ...