nonebot-adapter-qq 1.4.3__py3-none-any.whl → 1.4.4__py3-none-any.whl

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/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/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.dist-info → nonebot_adapter_qq-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.4.3
+Version: 1.4.4
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
@@ -19,7 +19,7 @@ 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.dist-info → nonebot_adapter_qq-1.4.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nonebot/adapters/qq/__init__.py,sha256=u2bR9HLdgIEV22nu2VJeUFscklTUj8DN4650q0k5SHw,787
-nonebot/adapters/qq/adapter.py,sha256=WAvX20qtfn1xaCPRRVImZy-omYiDWqf2vXz8aQoPHQE,14410
+nonebot/adapters/qq/adapter.py,sha256=ivVkSvUFcQEGIp9AmDTwP17HFNnrMmg6LYF1pfORi2s,14464
 nonebot/adapters/qq/bot.py,sha256=cxIJKilZbsqP9zn66xlxJJeHV3FexR7HHqS3qjrkR9o,60571
 nonebot/adapters/qq/compat.py,sha256=7g5QvRzWREesZ7MSEhNRh53UZwEyhQlxE3e_KpqQ0pw,768
 nonebot/adapters/qq/config.py,sha256=rdBWweI0db8-9KQF-lvNLMCMa55PJPOkvn9DVJMprac,2148
@@ -7,14 +7,14 @@ nonebot/adapters/qq/event.py,sha256=4VvHq7l5aQYmIEBLpjHrCL_neqYBTximeuPHQHnt384,
 nonebot/adapters/qq/exception.py,sha256=8Xa9NwYyO7Ih0owBAC_zmEiIRAA8GjgQcoJcF5ogo0g,2701
 nonebot/adapters/qq/message.py,sha256=JQsK9SDVXq_5FKnH6gLtbVXSgTnKPoNwA9Yhzrm6Z6c,11292
 nonebot/adapters/qq/models/__init__.py,sha256=AahR-O5B_1c8dMXHpDH68o4qojhF3vf4UPDGyH2MKjA,537
-nonebot/adapters/qq/models/common.py,sha256=ml178vUJCfxv4fNEsGK7PKM-UiKpWlAi4bYmm-CypwQ,4046
-nonebot/adapters/qq/models/guild.py,sha256=H8exZ3RvyQy4nnJ_iW-DYuQjMXCRuW8IIfd3hjfDvy4,11973
+nonebot/adapters/qq/models/common.py,sha256=AgGtLf2vC_rxluKFp26PTq0nFFPKuI_ALcGKdwped7A,4468
+nonebot/adapters/qq/models/guild.py,sha256=ZVSqYfm0_gP5hiTTQoPjhWZ06e7XzdaIVsPDyc2WrVs,11692
 nonebot/adapters/qq/models/payload.py,sha256=WCjf9usGO4nlaYT99j3bsk8yLuUUlwfSK0gNqAONN6o,2819
 nonebot/adapters/qq/models/qq.py,sha256=zzpHdXgSHoiT-tPyjmR2YjL4IZpLogc-tvAThh7WvdM,1859
 nonebot/adapters/qq/permission.py,sha256=0aedypl6xymhAV3UkW0vlvHTBkJeDmOef3SxG2tPcHQ,988
 nonebot/adapters/qq/store.py,sha256=X-NeSVCrxngQDPo9IXKWehERNa4sefdrYrZn5-yucF4,874
 nonebot/adapters/qq/utils.py,sha256=rMHpOf1zUrVodCYULMTBr82pF54tGK3b5TMykSnY6jc,1568
-nonebot_adapter_qq-1.4.3.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
-nonebot_adapter_qq-1.4.3.dist-info/METADATA,sha256=VFQ3Bow3UuiBrtpxSuraenWDSwydTglBQBUAQw-9rsA,2785
-nonebot_adapter_qq-1.4.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nonebot_adapter_qq-1.4.3.dist-info/RECORD,,
+nonebot_adapter_qq-1.4.4.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
+nonebot_adapter_qq-1.4.4.dist-info/METADATA,sha256=UKdNJV7sHauTPKGloYluCatTS9TIZ0Fx66fqROdpdZg,2785
+nonebot_adapter_qq-1.4.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nonebot_adapter_qq-1.4.4.dist-info/RECORD,,