satori-python-adapter-qq 0.2.0__tar.gz → 0.2.1__tar.gz

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/.mina/adapter_qq.toml

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

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-qq
-Version: 0.2.0
+Version: 0.2.1
 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.2.0 → satori_python_adapter_qq-0.2.1}/pyproject.toml

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

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/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 QQBotNetwork, decode_channel, decode_guild, decode_member, decode_user
+from .utils import ROLE_MAPPING, QQBotNetwork, decode_channel, decode_guild, decode_member, decode_user
 
 
 def apply(
@@ -356,7 +356,13 @@ def apply(
                 "get",
                 f"guilds/{guild_id}/roles",
             )
-            roles = [Role(role["id"], role.get("name", "")) for role in res]
+            # roles = [Role(role["id"], role.get("name", "")) for role in res]
+            roles = []
+            for role in res:
+                if role["id"] in ROLE_MAPPING:
+                    roles.append(ROLE_MAPPING[role["id"]])
+                else:
+                    roles.append(Role(role["id"], role.get("name", "")))
             return PageResult(roles, next=None)
         raise NotFoundException("qq platform does not support guild.role.list")
 

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/src/satori/adapters/qq/events/guild.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from satori import EventType
 from satori.model import Event, Guild, Member, Role, User
 
-from ..utils import Payload, decode_channel, decode_guild, decode_user
+from ..utils import ROLE_MAPPING, Payload, decode_channel, decode_guild, decode_user
 from .base import register_event
 
 
@@ -57,7 +57,7 @@ async def guild_member_event(login, guild_login, net, payload: Payload):
         nick=raw["nick"],
         avatar=user.avatar,
         joined_at=datetime.fromisoformat(raw["joined_at"]),
-        roles=[Role(r) for r in raw["roles"]],
+        roles=[(ROLE_MAPPING.get(r) or Role(r)) for r in raw["roles"]],
     )
     operator = User(raw["op_user_id"])
     return Event(t, datetime.now(), guild_login, guild=guild, user=user, member=member, operator=operator)

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/src/satori/adapters/qq/events/message.py

@@ -6,7 +6,7 @@ from satori import At, EventType, Text
 from satori.model import Channel, ChannelType, EmojiObject, Event, Guild, Member, MessageObject, Role, User
 
 from ..message import decode_segments
-from ..utils import USER_AVATAR_URL, Payload, decode_user
+from ..utils import ROLE_MAPPING, USER_AVATAR_URL, Payload, decode_user
 from .base import register_event
 
 
@@ -21,7 +21,7 @@ async def at_message(login, guild_login, net, payload: Payload):
         user,
         avatar=user.avatar,
         joined_at=datetime.fromisoformat(raw["member"]["joined_at"]),
-        roles=[Role(r) for r in raw["member"]["roles"]],
+        roles=[(ROLE_MAPPING.get(r) or Role(r)) for r in raw["member"]["roles"]],
     )
     msg = decode_segments(raw)
     if len(msg) >= 2 and isinstance(msg[0], At) and isinstance(msg[1], Text):
@@ -169,7 +169,7 @@ async def message_delete(login, guild_login, new, payload: Payload):
         user,
         avatar=user.avatar,
         joined_at=datetime.fromisoformat(raw["message"]["member"]["joined_at"]),
-        roles=[Role(r) for r in raw["message"]["member"]["roles"]],
+        roles=[(ROLE_MAPPING.get(r) or Role(r)) for r in raw["message"]["member"]["roles"]],
     )
     return Event(
         EventType.MESSAGE_DELETED,

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/src/satori/adapters/qq/main.py

@@ -438,5 +438,8 @@ class QQBotWebhookAdapter(BaseAdapter):
         await self.handle_event(app_id, payload)
         return Response(status_code=200)
 
+    def __str__(self):
+        return self.id
+
 
 __all__ = ["QQBotWebhookAdapter"]

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/src/satori/adapters/qq/utils.py

@@ -122,15 +122,16 @@ def decode_member(profile: dict) -> Member:
         decode_user(profile["user"]) if "user" in profile else None,
         profile.get("nick"),
         joined_at=datetime.fromisoformat(profile["joined_at"]) if "joined_at" in profile else None,
-        roles=[Role(r) for r in profile["roles"]],
+        roles=[(ROLE_MAPPING.get(r) or Role(r)) for r in profile["roles"]],
     )
 
 
 USER_AVATAR_URL = "https://q.qlogo.cn/qqapp/{app_id}/{user_id}/100"
 
 
-# ROLE_MAPPING = {
-#     "member": Role("MEMBER", "群成员"),
-#     "admin": Role("ADMINISTRATOR", "管理员"),
-#     "owner": Role("OWNER", "群主"),
-# }
+ROLE_MAPPING = {
+    "1": Role("member", "成员"),
+    "5": Role("channel_admin", "子频道管理员"),
+    "2": Role("admin", "管理员"),
+    "4": Role("owner", "创建者"),
+}

{satori_python_adapter_qq-0.2.0 → satori_python_adapter_qq-0.2.1}/src/satori/adapters/qq/websocket.py

@@ -554,5 +554,8 @@ class QQBotWebsocketAdapter(BaseAdapter):
                 logger.info(f"{self} Reconnecting...")
                 continue
 
+    def __str__(self):
+        return self.id
+
 
 __all__ = ["QQBotWebsocketAdapter", "Intents"]