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

{satori_python_adapter_qq-0.3.3 → 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.3"
+version = "0.4.0-rc1"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_qq-0.3.3 → 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.3
+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.3 → satori_python_adapter_qq-0.4.0rc1}/pyproject.toml

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

{satori_python_adapter_qq-0.3.3 → 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.3 → satori_python_adapter_qq-0.4.0rc1}/src/satori/adapters/qq/message.py

@@ -597,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":