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

{satori_python_adapter_qq-0.3.1 → satori_python_adapter_qq-0.3.3}/.mina/adapter_qq.toml

@@ -1,12 +1,12 @@
 includes = ["src/satori/adapters/qq"]
 raw-dependencies = [
-    "satori-python<1.4.0,>= 1.3.0",
+    "satori-python<1.4.0,>= 1.3.3",
     "cryptography>=46.0.4",
 ]
 
 [project]
 name = "satori-python-adapter-qq"
-version = "0.3.1"
+version = "0.3.3"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-qq
-Version: 0.3.1
+Version: 0.3.3
 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>
@@ -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<1.4.0,>=1.3.0
+Requires-Dist: satori-python<1.4.0,>=1.3.3
 Requires-Dist: cryptography>=46.0.4
 Description-Content-Type: text/markdown
 

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

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-qq"
-version = "0.3.1"
+version = "0.3.3"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python<1.4.0,>= 1.3.0",
+    "satori-python<1.4.0,>= 1.3.3",
     "cryptography>=46.0.4",
 ]
 description = "Satori Protocol SDK for python, adapter for QQ"
@@ -39,15 +39,14 @@ build-backend = "mina.backend"
 
 [dependency-groups]
 dev = [
-    "isort>=5.13.2",
-    "black>=24.4.0",
-    "ruff>=0.4.1",
+    "black>=26.3.0",
+    "ruff>=0.15.1",
     "pre-commit>=3.7.0",
-    "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
     "nonechat<0.7.0,>=0.6.0",
     "uvicorn[standard]>=0.37.0",
+    "pydantic>=2.13.1",
 ]
 
 [tool.pdm.build]
@@ -61,7 +60,7 @@ excludes = [
 
 [tool.pdm.scripts.format]
 composite = [
-    "isort ./src/ ./example/",
+    "ruff check --select I --fix ./src/ ./example/",
     "black ./src/ ./example/",
     "ruff check",
 ]
@@ -75,14 +74,6 @@ line-length = 120
 include = "\\.pyi?$"
 extend-exclude = ""
 
-[tool.isort]
-profile = "black"
-line_length = 120
-skip_gitignore = true
-extra_standard_library = [
-    "typing_extensions",
-]
-
 [tool.ruff]
 line-length = 120
 target-version = "py310"
@@ -92,6 +83,7 @@ exclude = [
     "exam2.py",
     "src/satori/_vendor/*",
 ]
+respect-gitignore = true
 
 [tool.ruff.lint]
 select = [
@@ -111,6 +103,12 @@ ignore = [
     "T201",
 ]
 
+[tool.ruff.lint.isort]
+extra-standard-library = [
+    "typing_extensions",
+]
+force-sort-within-sections = false
+
 [tool.pyright]
 pythonPlatform = "All"
 pythonVersion = "3.10"

{satori_python_adapter_qq-0.3.1 → satori_python_adapter_qq-0.3.3}/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.1 → satori_python_adapter_qq-0.3.3}/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.1 → satori_python_adapter_qq-0.3.3}/src/satori/adapters/qq/main.py

@@ -318,7 +318,9 @@ class QQBotWebhookAdapter(BaseAdapter):
         bot_info = await network.call_api("get", "users/@me")
         user = decode_user(bot_info)
         user.is_bot = True
-        login = Login(0, LoginStatus.ONLINE, "qqbot", platform="qq", user=user, features=QQ_FEATURES.copy())
+        login = Login(
+            sn=0, status=LoginStatus.ONLINE, adapter="qqbot", platform="qq", user=user, features=QQ_FEATURES.copy()
+        )
         previous = next((lg for lg in self.logins if lg.id == login.id and lg.platform == "qq"), None)
         if previous:
             previous.user = login.user
@@ -331,7 +333,12 @@ class QQBotWebhookAdapter(BaseAdapter):
             event_type = EventType.LOGIN_ADDED
         await self.server.post(Event(event_type, datetime.now(), login))
         guild_login = Login(
-            0, LoginStatus.ONLINE, "qqbot", platform="qqguild", user=user, features=QQ_GUILD_FEATURES.copy()
+            sn=0,
+            status=LoginStatus.ONLINE,
+            adapter="qqbot",
+            platform="qqguild",
+            user=user,
+            features=QQ_GUILD_FEATURES.copy(),
         )
         previous = next((lg for lg in self.logins if lg.id == guild_login.id and lg.platform == "qqguild"), None)
         if previous:

{satori_python_adapter_qq-0.3.1 → satori_python_adapter_qq-0.3.3}/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),

{satori_python_adapter_qq-0.3.1 → satori_python_adapter_qq-0.3.3}/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: ...
 
 

{satori_python_adapter_qq-0.3.1 → satori_python_adapter_qq-0.3.3}/src/satori/adapters/qq/websocket.py

@@ -330,7 +330,9 @@ class QQBotWebsocketAdapter(BaseAdapter):
     async def refresh_login(self, profile: dict):
         user = decode_user(profile)
         user.is_bot = True
-        login = Login(0, LoginStatus.ONLINE, "qqbot", platform="qq", user=user, features=QQ_FEATURES.copy())
+        login = Login(
+            sn=0, status=LoginStatus.ONLINE, adapter="qqbot", platform="qq", user=user, features=QQ_FEATURES.copy()
+        )
         previous = next((lg for lg in self.logins if lg.id == login.id and lg.platform == "qq"), None)
         if previous:
             previous.user = login.user
@@ -343,7 +345,12 @@ class QQBotWebsocketAdapter(BaseAdapter):
             event_type = EventType.LOGIN_ADDED
         await self.server.post(Event(event_type, datetime.now(), login))
         guild_login = Login(
-            0, LoginStatus.ONLINE, "qqbot", platform="qqguild", user=user, features=QQ_GUILD_FEATURES.copy()
+            sn=0,
+            status=LoginStatus.ONLINE,
+            adapter="qqbot",
+            platform="qqguild",
+            user=user,
+            features=QQ_GUILD_FEATURES.copy(),
         )
         previous = next((lg for lg in self.logins if lg.id == guild_login.id and lg.platform == "qqguild"), None)
         if previous: