nonebot-adapter-qq 1.4.3__tar.gz → 1.5.0__tar.gz

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/PKG-INFO

@@ -1,25 +1,24 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.4.3
+Version: 1.5.0
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
 Keywords: bot,qq,qqbot,qqguild
 Author: yanyongyu
 Author-email: yyy@nonebot.dev
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Robot Framework
 Classifier: Framework :: Robot Framework :: Library
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: nonebot2 (>=2.2.0,<3.0.0)
+Requires-Dist: nonebot2 (>=2.2.1,<3.0.0)
 Requires-Dist: pydantic (>=1.10.0,<3.0.0,!=2.5.0,!=2.5.1)
 Requires-Dist: typing-extensions (>=4.4.0,<5.0.0)
 Requires-Dist: yarl (>=1.9.0,<2.0.0)

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/nonebot/adapters/qq/adapter.py

@@ -1,12 +1,11 @@
 import sys
-import json
 import asyncio
 from typing_extensions import override
 from typing import Any, List, Tuple, Literal, Optional
 
 from nonebot.utils import escape_tag
 from nonebot.exception import WebSocketClosed
-from nonebot.compat import PYDANTIC_V2, type_validate_python
+from nonebot.compat import PYDANTIC_V2, type_validate_json, type_validate_python
 from nonebot.drivers import (
     URL,
     Driver,
@@ -68,7 +67,7 @@ class Adapter(BaseAdapter):
                 "websocket client! "
                 "QQ Adapter need a WebSocketClient Driver to work."
             )
-        self.driver.on_startup(self.startup)
+        self.on_ready(self.startup)
         self.driver.on_shutdown(self.shutdown)
 
     async def startup(self) -> None:
@@ -241,7 +240,8 @@ class Adapter(BaseAdapter):
     ) -> Optional[Literal[True]]:
         """鉴权连接"""
         if not bot.ready:
-            payload = Identify.parse_obj(
+            payload = type_validate_python(
+                Identify,
                 {
                     "data": {
                         "token": await bot._get_authorization_header(),
@@ -252,18 +252,19 @@ class Adapter(BaseAdapter):
                             "$language": f"python {sys.version}",
                             "$sdk": "NoneBot2",
                         },
-                    },
-                }
+                    }
+                },
             )
         else:
-            payload = Resume.parse_obj(
+            payload = type_validate_python(
+                Resume,
                 {
                     "data": {
                         "token": await bot._get_authorization_header(),
                         "session_id": bot.session_id,
                         "seq": bot.sequence,
                     }
-                }
+                },
             )
 
         try:
@@ -326,7 +327,7 @@ class Adapter(BaseAdapter):
         while True:
             if bot.ready:
                 log("TRACE", f"Heartbeat {bot.sequence}")
-                payload = Heartbeat.parse_obj({"data": bot.sequence})
+                payload = type_validate_python(Heartbeat, {"data": bot.sequence})
                 try:
                     await ws.send(self.payload_to_json(payload))
                 except Exception as e:
@@ -387,7 +388,7 @@ class Adapter(BaseAdapter):
 
     @staticmethod
     async def receive_payload(bot: Bot, ws: WebSocket) -> Payload:
-        payload = type_validate_python(PayloadType, json.loads(await ws.receive()))
+        payload = type_validate_json(PayloadType, await ws.receive())
         if isinstance(payload, Dispatch):
             bot.on_dispatch(payload)
         return payload

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/nonebot/adapters/qq/message.py

@@ -428,3 +428,7 @@ class Message(BaseMessage[MessageSegment]):
             if seg.type
             in ("text", "emoji", "mention_user", "mention_everyone", "mention_channel")
         )
+
+    @override
+    def extract_plain_text(self) -> str:
+        return "".join(seg.data["text"] for seg in self if seg.is_text())

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/nonebot/adapters/qq/models/common.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from urllib.parse import urlparse
 from typing import List, Literal, Optional
 
@@ -119,6 +120,19 @@ class MessageKeyboard(BaseModel):
     content: Optional[InlineKeyboard] = None
 
 
+# Message Audit Event
+class MessageAudited(BaseModel):
+    audit_id: str
+    message_id: Optional[str] = None
+    user_openid: Optional[str] = None
+    group_openid: Optional[str] = None
+    guild_id: Optional[str] = None
+    channel_id: Optional[str] = None
+    audit_time: datetime
+    create_time: Optional[datetime] = None
+    seq_in_channel: Optional[str] = None
+
+
 # Interaction Event
 class ButtonInteractionContent(BaseModel):
     user_id: Optional[str] = None
@@ -167,6 +181,7 @@ __all__ = [
     "InlineKeyboardRow",
     "InlineKeyboard",
     "MessageKeyboard",
+    "MessageAudited",
     "ButtonInteractionContent",
     "ButtonInteractionData",
     "ButtonInteraction",

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/nonebot/adapters/qq/models/guild.py

@@ -162,17 +162,6 @@ class MessageDelete(BaseModel):
     op_user: User
 
 
-# Message Audit Event
-class MessageAudited(BaseModel):
-    audit_id: str
-    message_id: Optional[str] = None
-    guild_id: str
-    channel_id: str
-    audit_time: datetime
-    create_time: Optional[datetime] = None
-    seq_in_channel: Optional[str] = None
-
-
 # Message Setting
 class MessageSetting(BaseModel):
     disable_create_dm: bool
@@ -525,7 +514,6 @@ __all__ = [
     "ChannelPermissions",
     "Message",
     "MessageDelete",
-    "MessageAudited",
     "MessageSetting",
     "DMS",
     "RecommendChannel",

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.4.3"
+version = "1.5.0"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -19,14 +19,14 @@ classifiers = [
 packages = [{ include = "nonebot" }]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 yarl = "^1.9.0"
-nonebot2 = "^2.2.0"
+nonebot2 = "^2.2.1"
 typing-extensions = ">=4.4.0, <5.0.0"
 pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.3.0"
+ruff = "^0.5.0"
 isort = "^5.10.1"
 black = "^24.0.0"
 nonemoji = "^0.1.3"

{nonebot_adapter_qq-1.4.3 → nonebot_adapter_qq-1.5.0}/nonebot/adapters/qq/bot.py

@@ -327,12 +327,12 @@ class Bot(BaseBot):
         elif file_image := message["file_image"]:
             kwargs["file_type"] = 1
             kwargs["file_data"] = file_image[-1].data["content"]
-        elif file_audio := message["file_audio"]:
-            kwargs["file_type"] = 2
-            kwargs["file_data"] = file_audio[-1].data["content"]
         elif file_video := message["file_video"]:
-            kwargs["file_type"] = 3
+            kwargs["file_type"] = 2
             kwargs["file_data"] = file_video[-1].data["content"]
+        elif file_audio := message["file_audio"]:
+            kwargs["file_type"] = 3
+            kwargs["file_data"] = file_audio[-1].data["content"]
         elif file_file := message["file_file"]:
             kwargs["file_type"] = 4
             kwargs["file_data"] = file_file[-1].data["content"]