nonebot-adapter-qq 1.4.4__tar.gz → 1.5.1__tar.gz

{nonebot_adapter_qq-1.4.4 → nonebot_adapter_qq-1.5.1}/PKG-INFO

@@ -1,20 +1,19 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.4.4
+Version: 1.5.1
 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

{nonebot_adapter_qq-1.4.4 → nonebot_adapter_qq-1.5.1}/nonebot/adapters/qq/adapter.py

@@ -405,10 +405,14 @@ class Adapter(BaseAdapter):
         EventClass = EVENT_CLASSES.get(payload.type, None)
         if EventClass is None:
             log("WARNING", f"Unknown payload type: {payload.type}")
-            event = type_validate_python(Event, payload.data)
+            event = type_validate_python(
+                Event, {"event_id": payload.id, **payload.data}
+            )
             event.__type__ = payload.type  # type: ignore
             return event
-        return type_validate_python(EventClass, payload.data)
+        return type_validate_python(
+            EventClass, {"event_id": payload.id, **payload.data}
+        )
 
     @override
     async def _call_api(self, bot: Bot, api: str, **data: Any) -> Any:

{nonebot_adapter_qq-1.4.4 → nonebot_adapter_qq-1.5.1}/nonebot/adapters/qq/event.py

@@ -117,6 +117,9 @@ class EventType(str, Enum):
 class Event(BaseEvent):
     __type__: EventType
 
+    # event id from payload id
+    event_id: Optional[str] = None
+
     @override
     def get_event_name(self) -> str:
         return self.__type__

{nonebot_adapter_qq-1.4.4 → nonebot_adapter_qq-1.5.1}/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.4 → nonebot_adapter_qq-1.5.1}/nonebot/adapters/qq/models/payload.py

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import Tuple, Union
+from typing import Tuple, Union, Optional
 from typing_extensions import Literal, Annotated
 
 from pydantic import Field, BaseModel
@@ -43,6 +43,7 @@ class Dispatch(Payload):
     data: dict
     sequence: int
     type: str
+    id: Optional[str] = None
 
 
 class Heartbeat(Payload):

{nonebot_adapter_qq-1.4.4 → nonebot_adapter_qq-1.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.4.4"
+version = "1.5.1"
 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.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.4.0"
+ruff = "^0.6.0"
 isort = "^5.10.1"
 black = "^24.0.0"
 nonemoji = "^0.1.3"

{nonebot_adapter_qq-1.4.4 → nonebot_adapter_qq-1.5.1}/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"]