nonebot-adapter-qq 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

nonebot/adapters/qq/__init__.py

@@ -1,10 +1,10 @@
-from .event import *
-from .permission import *
 from .bot import Bot as Bot
 from .utils import log as log
+from .event import *  # noqa: F403
 from .utils import escape as escape
 from .adapter import Adapter as Adapter
 from .message import Message as Message
+from .permission import *  # noqa: F403
 from .utils import unescape as unescape
 from .exception import ActionFailed as ActionFailed
 from .exception import NetworkError as NetworkError

nonebot/adapters/qq/adapter.py

@@ -1,7 +1,7 @@
 import sys
 import asyncio
 from typing_extensions import override
-from typing import Any, List, Tuple, Literal, Optional
+from typing import Any, Literal, Optional
 
 from nonebot.utils import escape_tag
 from nonebot.exception import WebSocketClosed
@@ -46,7 +46,7 @@ class Adapter(BaseAdapter):
 
         self.qq_config: Config = Config(**self.config.dict())
 
-        self.tasks: List["asyncio.Task"] = []
+        self.tasks: list["asyncio.Task"] = []
         self.setup()
 
     @classmethod
@@ -137,7 +137,7 @@ class Adapter(BaseAdapter):
             # wait for session start concurrency limit
             await asyncio.sleep(gateway_info.session_start_limit.max_concurrency or 1)
 
-    async def _forward_ws(self, bot: Bot, ws_url: URL, shard: Tuple[int, int]) -> None:
+    async def _forward_ws(self, bot: Bot, ws_url: URL, shard: tuple[int, int]) -> None:
         # ws setup request
         request = Request(
             "GET",
@@ -236,7 +236,7 @@ class Adapter(BaseAdapter):
             )
 
     async def _authenticate(
-        self, bot: Bot, ws: WebSocket, shard: Tuple[int, int]
+        self, bot: Bot, ws: WebSocket, shard: tuple[int, int]
     ) -> Optional[Literal[True]]:
         """鉴权连接"""
         if not bot.ready:
@@ -318,7 +318,7 @@ class Adapter(BaseAdapter):
             )
 
         if ready_event:
-            asyncio.create_task(bot.handle_event(ready_event))
+            asyncio.create_task(bot.handle_event(ready_event))  # noqa: RUF006
 
         return True
 
@@ -354,7 +354,7 @@ class Adapter(BaseAdapter):
                 else:
                     if isinstance(event, MessageAuditEvent):
                         audit_result.add_result(event)
-                    asyncio.create_task(bot.handle_event(event))
+                    asyncio.create_task(bot.handle_event(event))  # noqa: RUF006
             elif isinstance(payload, HeartbeatAck):
                 log("TRACE", "Heartbeat ACK")
                 continue
@@ -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/adapters/qq/bot.py

@@ -6,8 +6,6 @@ from typing import (
     IO,
     TYPE_CHECKING,
     Any,
-    Dict,
-    List,
     Union,
     Literal,
     NoReturn,
@@ -42,6 +40,7 @@ from .event import (
     QQMessageEvent,
     GuildMessageEvent,
     C2CMessageCreateEvent,
+    InteractionCreateEvent,
     DirectMessageCreateEvent,
     GroupAtMessageCreateEvent,
 )
@@ -110,7 +109,7 @@ async def _check_reply(
         if event.reply.author.id == bot.self_info.id:
             event.to_me = True
     except Exception as e:
-        log("WARNING", f"Error when getting message reply info: {repr(e)}", e)
+        log("WARNING", f"Error when getting message reply info: {e!r}", e)
 
 
 def _check_at_me(
@@ -264,7 +263,7 @@ class Bot(BaseBot):
             return f"QQBot {await self.get_access_token()}"
         return f"Bot {self.bot_info.id}.{self.bot_info.token}"
 
-    async def get_authorization_header(self) -> Dict[str, str]:
+    async def get_authorization_header(self) -> dict[str, str]:
         """获取当前 Bot 的鉴权信息"""
         headers = {"Authorization": await self._get_authorization_header()}
         if self.bot_info.is_group_bot:
@@ -284,7 +283,7 @@ class Bot(BaseBot):
         return _message
 
     @staticmethod
-    def _extract_send_message(message: Message) -> Dict[str, Any]:
+    def _extract_send_message(message: Message) -> dict[str, Any]:
         kwargs = {}
         content = message.extract_content() or None
         kwargs["content"] = content
@@ -301,7 +300,7 @@ class Bot(BaseBot):
         return kwargs
 
     @staticmethod
-    def _extract_guild_image(message: Message) -> Dict[str, Any]:
+    def _extract_guild_image(message: Message) -> dict[str, Any]:
         kwargs = {}
         if image := (message["image"] or None):
             kwargs["image"] = image[-1].data["url"]
@@ -310,7 +309,7 @@ class Bot(BaseBot):
         return kwargs
 
     @staticmethod
-    def _extract_qq_media(message: Message) -> Dict[str, Any]:
+    def _extract_qq_media(message: Message) -> dict[str, Any]:
         kwargs = {}
         if image := message["image"]:
             kwargs["file_type"] = 1
@@ -433,7 +432,7 @@ class Bot(BaseBot):
             msg_type = 4
         elif kwargs.get("ark"):
             msg_type = 3
-        elif kwargs.get("markdown"):
+        elif kwargs.get("markdown") or kwargs.get("keyboard"):
             msg_type = 2
         elif (
             message["image"]
@@ -507,6 +506,23 @@ class Bot(BaseBot):
                 msg_id=event.id,
                 msg_seq=event._reply_seq,
             )
+        elif isinstance(event, InteractionCreateEvent):
+            if gid := event.group_openid:
+                return await self.send_to_group(
+                    group_openid=gid, event_id=event.event_id, message=message
+                )
+            elif cid := event.channel_id:
+                return await self.send_to_channel(
+                    channel_id=cid, event_id=event.event_id, message=message
+                )
+            elif uid := event.user_openid:
+                return await self.send_to_c2c(
+                    openid=uid, event_id=event.event_id, message=message
+                )
+            elif gid := event.guild_id:
+                return await self.send_to_dms(
+                    guild_id=gid, event_id=event.event_id, message=message
+                )
 
         raise RuntimeError("Event cannot be replied to!")
 
@@ -589,13 +605,13 @@ class Bot(BaseBot):
         before: Optional[str] = None,
         after: Optional[str] = None,
         limit: Optional[float] = None,
-    ) -> List[Guild]:
+    ) -> list[Guild]:
         request = Request(
             "GET",
             self.adapter.get_api_base().joinpath("users", "@me", "guilds"),
             params=exclude_none({"before": before, "after": after, "limit": limit}),
         )
-        return type_validate_python(List[Guild], await self._request(request))
+        return type_validate_python(list[Guild], await self._request(request))
 
     # Guild API
     @API
@@ -608,12 +624,12 @@ class Bot(BaseBot):
 
     # Channel API
     @API
-    async def get_channels(self, *, guild_id: str) -> List[Channel]:
+    async def get_channels(self, *, guild_id: str) -> list[Channel]:
         request = Request(
             "GET",
             self.adapter.get_api_base().joinpath("guilds", guild_id, "channels"),
         )
-        return type_validate_python(List[Channel], await self._request(request))
+        return type_validate_python(list[Channel], await self._request(request))
 
     @API
     async def get_channel(self, *, channel_id: str) -> Channel:
@@ -634,10 +650,10 @@ class Bot(BaseBot):
         position: Optional[int] = None,
         parent_id: Optional[int] = None,
         private_type: Optional[Union[PrivateType, int]] = None,
-        private_user_ids: Optional[List[str]] = None,
+        private_user_ids: Optional[list[str]] = None,
         speak_permission: Optional[Union[SpeakPermission, int]] = None,
         application_id: Optional[str] = None,
-    ) -> List[Channel]:
+    ) -> list[Channel]:
         request = Request(
             "POST",
             self.adapter.get_api_base().joinpath("guilds", guild_id, "channels"),
@@ -655,7 +671,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return type_validate_python(List[Channel], await self._request(request))
+        return type_validate_python(list[Channel], await self._request(request))
 
     @API
     async def patch_channel(
@@ -705,13 +721,13 @@ class Bot(BaseBot):
         guild_id: str,
         after: Optional[str] = None,
         limit: Optional[float] = None,
-    ) -> List[Member]:
+    ) -> list[Member]:
         request = Request(
             "GET",
             self.adapter.get_api_base().joinpath("guilds", guild_id, "members"),
             params=exclude_none({"after": after, "limit": limit}),
         )
-        return type_validate_python(List[Member], await self._request(request))
+        return type_validate_python(list[Member], await self._request(request))
 
     @API
     async def get_role_members(
@@ -940,7 +956,7 @@ class Bot(BaseBot):
         return type_validate_python(GuildMessage, result)
 
     @staticmethod
-    def _parse_send_message(data: Dict[str, Any]) -> Dict[str, Any]:
+    def _parse_send_message(data: dict[str, Any]) -> dict[str, Any]:
         data = exclude_none(data)
         data = {
             k: v.dict(exclude_none=True) if isinstance(v, BaseModel) else v
@@ -948,8 +964,8 @@ class Bot(BaseBot):
         }
         if file_image := data.pop("file_image", None):
             # 使用 multipart/form-data
-            multipart_files: Dict[str, Any] = {"file_image": ("file_image", file_image)}
-            multipart_data: Dict[str, Any] = {}
+            multipart_files: dict[str, Any] = {"file_image": ("file_image", file_image)}
+            multipart_data: dict[str, Any] = {}
             for k, v in data.items():
                 if isinstance(v, (dict, list)):
                     # 当字段类型为对象或数组时需要将字段序列化为 JSON 字符串后进行调用
@@ -1154,10 +1170,10 @@ class Bot(BaseBot):
         self,
         *,
         guild_id: str,
-        user_ids: List[str],
+        user_ids: list[str],
         mute_end_timestamp: Optional[Union[int, datetime]] = None,
         mute_seconds: Optional[Union[int, timedelta]] = None,
-    ) -> List[int]:
+    ) -> list[int]:
         if isinstance(mute_end_timestamp, datetime):
             mute_end_timestamp = int(mute_end_timestamp.timestamp())
 
@@ -1175,7 +1191,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return type_validate_python(List[int], await self._request(request))
+        return type_validate_python(list[int], await self._request(request))
 
     # Announce API
     @API
@@ -1186,7 +1202,7 @@ class Bot(BaseBot):
         message_id: Optional[str] = None,
         channel_id: Optional[str] = None,
         announces_type: Optional[int] = None,
-        recommend_channels: Optional[List[RecommendChannel]] = None,
+        recommend_channels: Optional[list[RecommendChannel]] = None,
     ) -> None:
         request = Request(
             "POST",
@@ -1251,7 +1267,7 @@ class Bot(BaseBot):
     @API
     async def get_schedules(
         self, *, channel_id: str, since: Optional[Union[int, datetime]] = None
-    ) -> List[Schedule]:
+    ) -> list[Schedule]:
         if isinstance(since, datetime):
             since = int(since.timestamp() * 1000)
 
@@ -1260,7 +1276,7 @@ class Bot(BaseBot):
             self.adapter.get_api_base() / f"channels/{channel_id}/schedules",
             json=exclude_none({"since": since}),
         )
-        return type_validate_python(List[Schedule], await self._request(request))
+        return type_validate_python(list[Schedule], await self._request(request))
 
     @API
     async def get_schedule(self, *, channel_id: str, schedule_id: str) -> Schedule:
@@ -1442,7 +1458,7 @@ class Bot(BaseBot):
         audio_url: Optional[str] = None,
         text: Optional[str] = None,
         status: Union[AudioStatus, int],
-    ) -> Dict[Never, Never]:
+    ) -> dict[Never, Never]:
         request = Request(
             "POST",
             self.adapter.get_api_base().joinpath("channels", channel_id, "audio"),
@@ -1453,7 +1469,7 @@ class Bot(BaseBot):
         return await self._request(request)
 
     @API
-    async def put_mic(self, *, channel_id: str) -> Dict[Never, Never]:
+    async def put_mic(self, *, channel_id: str) -> dict[Never, Never]:
         request = Request(
             "PUT",
             self.adapter.get_api_base().joinpath("channels", channel_id, "mic"),
@@ -1461,7 +1477,7 @@ class Bot(BaseBot):
         return await self._request(request)
 
     @API
-    async def delete_mic(self, *, channel_id: str) -> Dict[Never, Never]:
+    async def delete_mic(self, *, channel_id: str) -> dict[Never, Never]:
         request = Request(
             "DELETE",
             self.adapter.get_api_base().joinpath("channels", channel_id, "mic"),

nonebot/adapters/qq/config.py

@@ -1,4 +1,4 @@
-from typing import List, Tuple, Optional
+from typing import Optional
 
 from pydantic import Field, HttpUrl, BaseModel
 from nonebot.compat import PYDANTIC_V2, ConfigDict
@@ -53,7 +53,7 @@ class BotInfo(BaseModel):
     id: str = Field(alias="id")
     token: str = Field(alias="token")
     secret: str = Field(alias="secret")
-    shard: Optional[Tuple[int, int]] = None
+    shard: Optional[tuple[int, int]] = None
     intent: Intents = Field(default_factory=Intents)
 
     @property
@@ -67,4 +67,4 @@ class Config(BaseModel):
     qq_api_base: HttpUrl = Field("https://api.sgroup.qq.com/")
     qq_sandbox_api_base: HttpUrl = Field("https://sandbox.api.sgroup.qq.com")
     qq_auth_base: HttpUrl = Field("https://bots.qq.com/app/getAppAccessToken")
-    qq_bots: List[BotInfo] = Field(default_factory=list)
+    qq_bots: list[BotInfo] = Field(default_factory=list)

nonebot/adapters/qq/event.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from datetime import datetime
 from typing_extensions import override
-from typing import Dict, Type, Tuple, TypeVar, Optional, cast
+from typing import TypeVar, Optional, cast
 
 from nonebot.utils import escape_tag
 
@@ -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__
@@ -142,10 +145,10 @@ class Event(BaseEvent):
         return False
 
 
-EVENT_CLASSES: Dict[str, Type[Event]] = {}
+EVENT_CLASSES: dict[str, type[Event]] = {}
 
 
-def register_event_class(event_class: Type[E]) -> Type[E]:
+def register_event_class(event_class: type[E]) -> type[E]:
     EVENT_CLASSES[event_class.__type__.value] = event_class
     return event_class
 
@@ -163,7 +166,7 @@ class ReadyEvent(MetaEvent):
     version: int
     session_id: str
     user: User
-    shard: Tuple[int, int]
+    shard: tuple[int, int]
 
 
 @register_event_class

nonebot/adapters/qq/message.py

@@ -2,8 +2,11 @@ import re
 from io import BytesIO
 from pathlib import Path
 from dataclasses import dataclass
+from collections.abc import Iterable
 from typing_extensions import Self, override
-from typing import TYPE_CHECKING, Type, Union, Iterable, Optional, TypedDict, overload
+from typing import TYPE_CHECKING, Union, Optional, TypedDict, overload
+
+from nonebot.compat import type_validate_python
 
 from nonebot.adapters import Message as BaseMessage
 from nonebot.adapters import MessageSegment as BaseMessageSegment
@@ -24,7 +27,7 @@ from .models import (
 class MessageSegment(BaseMessageSegment["Message"]):
     @classmethod
     @override
-    def get_message_class(cls) -> Type["Message"]:
+    def get_message_class(cls) -> type["Message"]:
         return Message
 
     @staticmethod
@@ -166,6 +169,32 @@ class MessageSegment(BaseMessageSegment["Message"]):
     def is_text(self) -> bool:
         return self.type == "text"
 
+    @classmethod
+    @override
+    def _validate(cls, value) -> Self:
+        if isinstance(value, cls):
+            return value
+        if isinstance(value, MessageSegment):
+            raise ValueError(f"Type {type(value)} can not be converted to {cls}")
+        if not isinstance(value, dict):
+            raise ValueError(f"Expected dict for MessageSegment, got {type(value)}")
+        if "type" not in value:
+            raise ValueError(
+                f"Expected dict with 'type' for MessageSegment, got {value}"
+            )
+        _type = value["type"]
+        if _type not in SEGMENT_TYPE_MAP:
+            raise ValueError(f"Invalid MessageSegment type: {_type}")
+        segment_type = SEGMENT_TYPE_MAP[_type]
+
+        # casting value to subclass of MessageSegment
+        if cls is MessageSegment:
+            return type_validate_python(segment_type, value)
+        # init segment instance directly if type matched
+        if cls is segment_type:
+            return segment_type(type=_type, data=value.get("data", {}))
+        raise ValueError(f"Segment type {_type!r} can not be converted to {cls}")
+
 
 class _TextData(TypedDict):
     text: str
@@ -278,6 +307,18 @@ class Embed(MessageSegment):
     def __str__(self) -> str:
         return f"<embed:{self.data['embed']!r}>"
 
+    @classmethod
+    @override
+    def _validate(cls, value) -> Self:
+        instance = super()._validate(value)
+        if "embed" not in instance.data:
+            raise ValueError(
+                f"Expected dict with 'embed' in 'data' for Embed, got {value}"
+            )
+        if not isinstance(embed := instance.data["embed"], MessageEmbed):
+            instance.data["embed"] = type_validate_python(MessageEmbed, embed)
+        return instance
+
 
 class _ArkData(TypedDict):
     ark: MessageArk
@@ -292,6 +333,16 @@ class Ark(MessageSegment):
     def __str__(self) -> str:
         return f"<ark:{self.data['ark']!r}>"
 
+    @classmethod
+    @override
+    def _validate(cls, value) -> Self:
+        instance = super()._validate(value)
+        if "ark" not in instance.data:
+            raise ValueError(f"Expected dict with 'ark' in 'data' for Ark, got {value}")
+        if not isinstance(ark := instance.data["ark"], MessageArk):
+            instance.data["ark"] = type_validate_python(MessageArk, ark)
+        return instance
+
 
 class _ReferenceData(TypedDict):
     reference: MessageReference
@@ -306,6 +357,20 @@ class Reference(MessageSegment):
     def __str__(self) -> str:
         return f"<reference:{self.data['reference'].message_id}>"
 
+    @classmethod
+    @override
+    def _validate(cls, value) -> Self:
+        instance = super()._validate(value)
+        if "reference" not in instance.data:
+            raise ValueError(
+                f"Expected dict with 'reference' in 'data' for Reference, got {value}"
+            )
+        if not isinstance(reference := instance.data["reference"], MessageReference):
+            instance.data["reference"] = type_validate_python(
+                MessageReference, reference
+            )
+        return instance
+
 
 class _MarkdownData(TypedDict):
     markdown: MessageMarkdown
@@ -320,6 +385,18 @@ class Markdown(MessageSegment):
     def __str__(self) -> str:
         return f"<markdown:{self.data['markdown']!r}>"
 
+    @classmethod
+    @override
+    def _validate(cls, value) -> Self:
+        instance = super()._validate(value)
+        if "markdown" not in instance.data:
+            raise ValueError(
+                f"Expected dict with 'markdown' in 'data' for Markdown, got {value}"
+            )
+        if not isinstance(markdown := instance.data["markdown"], MessageMarkdown):
+            instance.data["markdown"] = type_validate_python(MessageMarkdown, markdown)
+        return instance
+
 
 class _KeyboardData(TypedDict):
     keyboard: MessageKeyboard
@@ -334,11 +411,45 @@ class Keyboard(MessageSegment):
     def __str__(self) -> str:
         return f"<keyboard:{self.data['keyboard']!r}>"
 
+    @classmethod
+    @override
+    def _validate(cls, value) -> Self:
+        instance = super()._validate(value)
+        if "keyboard" not in instance.data:
+            raise ValueError(
+                f"Expected dict with 'keyboard' in 'data' for Keyboard, got {value}"
+            )
+        if not isinstance(keyboard := instance.data["keyboard"], MessageKeyboard):
+            instance.data["keyboard"] = type_validate_python(MessageKeyboard, keyboard)
+        return instance
+
+
+SEGMENT_TYPE_MAP: dict[str, type[MessageSegment]] = {
+    "text": Text,
+    "emoji": Emoji,
+    "mention_user": MentionUser,
+    "mention_channel": MentionChannel,
+    "mention_everyone": MentionEveryone,
+    "image": Attachment,
+    "file_image": LocalAttachment,
+    "audio": Attachment,
+    "file_audio": LocalAttachment,
+    "video": Attachment,
+    "file_video": LocalAttachment,
+    "file": Attachment,
+    "file_file": LocalAttachment,
+    "ark": Ark,
+    "embed": Embed,
+    "markdown": Markdown,
+    "keyboard": Keyboard,
+    "reference": Reference,
+}
+
 
 class Message(BaseMessage[MessageSegment]):
     @classmethod
     @override
-    def get_segment_class(cls) -> Type[MessageSegment]:
+    def get_segment_class(cls) -> type[MessageSegment]:
         return MessageSegment
 
     @override

nonebot/adapters/qq/models/__init__.py

@@ -1,6 +1,6 @@
-from .qq import *
-from .guild import *
-from .common import *
+from .qq import *  # noqa: F403
+from .guild import *  # noqa: F403
+from .common import *  # noqa: F403
 from .payload import Hello as Hello
 from .payload import Opcode as Opcode
 from .payload import Resume as Resume

nonebot/adapters/qq/models/common.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from urllib.parse import urlparse
-from typing import List, Literal, Optional
+from typing import Literal, Optional
 
 from pydantic import BaseModel
 
@@ -33,7 +33,7 @@ class MessageEmbed(BaseModel):
     description: Optional[str] = None
     prompt: str
     thumbnail: Optional[MessageEmbedThumbnail] = None
-    fields: Optional[List[MessageEmbedField]] = None
+    fields: Optional[list[MessageEmbedField]] = None
 
 
 # Message Ark
@@ -43,18 +43,18 @@ class MessageArkObjKv(BaseModel):
 
 
 class MessageArkObj(BaseModel):
-    obj_kv: Optional[List[MessageArkObjKv]] = None
+    obj_kv: Optional[list[MessageArkObjKv]] = None
 
 
 class MessageArkKv(BaseModel):
     key: Optional[str] = None
     value: Optional[str] = None
-    obj: Optional[List[MessageArkObj]] = None
+    obj: Optional[list[MessageArkObj]] = None
 
 
 class MessageArk(BaseModel):
     template_id: Optional[int] = None
-    kv: Optional[List[MessageArkKv]] = None
+    kv: Optional[list[MessageArkKv]] = None
 
 
 # Message Reference
@@ -66,21 +66,21 @@ class MessageReference(BaseModel):
 # Message Markdown
 class MessageMarkdownParams(BaseModel):
     key: Optional[str] = None
-    values: Optional[List[str]] = None
+    values: Optional[list[str]] = None
 
 
 class MessageMarkdown(BaseModel):
     template_id: Optional[int] = None
     custom_template_id: Optional[str] = None
-    params: Optional[List[MessageMarkdownParams]] = None
+    params: Optional[list[MessageMarkdownParams]] = None
     content: Optional[str] = None
 
 
 # Message Keyboard
 class Permission(BaseModel):
     type: Optional[int] = None
-    specify_role_ids: Optional[List[str]] = None
-    specify_user_ids: Optional[List[str]] = None
+    specify_role_ids: Optional[list[str]] = None
+    specify_user_ids: Optional[list[str]] = None
 
 
 class Action(BaseModel):
@@ -108,11 +108,11 @@ class Button(BaseModel):
 
 
 class InlineKeyboardRow(BaseModel):
-    buttons: Optional[List[Button]] = None
+    buttons: Optional[list[Button]] = None
 
 
 class InlineKeyboard(BaseModel):
-    rows: Optional[List[InlineKeyboardRow]] = None
+    rows: Optional[list[InlineKeyboardRow]] = None
 
 
 class MessageKeyboard(BaseModel):
@@ -140,6 +140,8 @@ class ButtonInteractionContent(BaseModel):
     feature_id: Optional[str] = None
     button_id: Optional[str] = None
     button_data: Optional[str] = None
+    checked: Optional[int] = None
+    feedback_opt: Optional[str] = None
 
 
 class ButtonInteractionData(BaseModel):
@@ -148,7 +150,7 @@ class ButtonInteractionData(BaseModel):
 
 class ButtonInteraction(BaseModel):
     id: str
-    type: Literal[11, 12]
+    type: Literal[11, 12, 13]
     version: int
     timestamp: str
     scene: str

nonebot/adapters/qq/models/guild.py

@@ -1,7 +1,7 @@
 import json
 from enum import IntEnum
 from datetime import datetime
-from typing import List, Union, Generic, TypeVar, Optional
+from typing import Union, Generic, TypeVar, Optional
 
 from pydantic import BaseModel
 from nonebot.compat import PYDANTIC_V2, model_fields, type_validate_python
@@ -91,12 +91,12 @@ class Channel(BaseModel):
 class Member(BaseModel):
     user: Optional[User] = None
     nick: Optional[str] = None
-    roles: Optional[List[str]] = None
+    roles: Optional[list[str]] = None
     joined_at: datetime
 
 
 class GetRoleMembersReturn(BaseModel):
-    data: List[Member]
+    data: list[Member]
     next: str
 
 
@@ -112,7 +112,7 @@ class Role(BaseModel):
 
 class GetGuildRolesReturn(BaseModel):
     guild_id: str
-    roles: List[Role]
+    roles: list[Role]
     role_num_limit: int
 
 
@@ -145,9 +145,9 @@ class Message(BaseModel):
     edited_timestamp: Optional[datetime] = None
     mention_everyone: Optional[bool] = None
     author: User
-    attachments: Optional[List[MessageAttachment]] = None
-    embeds: Optional[List[MessageEmbed]] = None
-    mentions: Optional[List[User]] = None
+    attachments: Optional[list[MessageAttachment]] = None
+    embeds: Optional[list[MessageEmbed]] = None
+    mentions: Optional[list[User]] = None
     member: Optional[Member] = None
     ark: Optional[MessageArk] = None
     seq: Optional[int] = None
@@ -166,7 +166,7 @@ class MessageDelete(BaseModel):
 class MessageSetting(BaseModel):
     disable_create_dm: bool
     disable_push_msg: bool
-    channel_ids: List[str]
+    channel_ids: list[str]
     channel_push_max_num: int
 
 
@@ -188,14 +188,14 @@ class Announces(BaseModel):
     channel_id: Optional[str] = None
     message_id: Optional[str] = None
     announces_type: Optional[int] = None
-    recommend_channels: Optional[List[RecommendChannel]] = None
+    recommend_channels: Optional[list[RecommendChannel]] = None
 
 
 # Pins
 class PinsMessage(BaseModel):
     guild_id: str
     channel_id: str
-    message_ids: List[str]
+    message_ids: list[str]
 
 
 # Schedule
@@ -251,7 +251,7 @@ class MessageReaction(BaseModel):
 
 
 class GetReactionUsersReturn(BaseModel):
-    users: List[User]
+    users: list[User]
     cookie: str
     is_end: bool
 
@@ -358,12 +358,12 @@ class ParagraphProps(BaseModel):
 
 
 class Paragraph(BaseModel):
-    elems: List[Elem]
+    elems: list[Elem]
     props: Optional[ParagraphProps] = None
 
 
 class RichText(BaseModel):
-    paragraphs: List[Paragraph]
+    paragraphs: list[Paragraph]
 
 
 class ThreadObjectInfo(BaseModel):
@@ -441,7 +441,7 @@ class ForumAuditResult(ForumSourceInfo):
 
 
 class GetThreadsListReturn(BaseModel):
-    threads: List[Thread[str]]
+    threads: list[Thread[str]]
     is_finish: bool
 
 
@@ -476,7 +476,7 @@ class APIPermissionDemand(BaseModel):
 
 
 class GetGuildAPIPermissionReturn(BaseModel):
-    apis: List[APIPermission]
+    apis: list[APIPermission]
 
 
 # WebSocket

nonebot/adapters/qq/models/payload.py

@@ -1,6 +1,6 @@
 from enum import IntEnum
-from typing import Tuple, Union
-from typing_extensions import Literal, Annotated
+from typing_extensions import Literal
+from typing import Union, Optional, Annotated
 
 from pydantic import Field, BaseModel
 from nonebot.compat import PYDANTIC_V2, ConfigDict
@@ -43,6 +43,7 @@ class Dispatch(Payload):
     data: dict
     sequence: int
     type: str
+    id: Optional[str] = None
 
 
 class Heartbeat(Payload):
@@ -53,7 +54,7 @@ class Heartbeat(Payload):
 class IdentifyData(BaseModel):
     token: str
     intents: int
-    shard: Tuple[int, int]
+    shard: tuple[int, int]
     properties: dict
 
     if PYDANTIC_V2:

nonebot/adapters/qq/models/qq.py

@@ -1,5 +1,5 @@
+from typing import Optional
 from datetime import datetime
-from typing import List, Optional
 from urllib.parse import urlparse
 
 from pydantic import BaseModel
@@ -40,7 +40,7 @@ class QQMessage(BaseModel):
     id: str
     content: str
     timestamp: str
-    attachments: Optional[List[Attachment]] = None
+    attachments: Optional[list[Attachment]] = None
 
 
 class PostC2CMessagesReturn(BaseModel):
@@ -71,7 +71,7 @@ class GroupMember(BaseModel):
 
 
 class PostGroupMembersReturn(BaseModel):
-    members: List[GroupMember]
+    members: list[GroupMember]
     next_index: Optional[int] = None
 
 

nonebot/adapters/qq/store.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import TYPE_CHECKING, Dict, Optional
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from .event import MessageAuditEvent
@@ -7,7 +7,7 @@ if TYPE_CHECKING:
 
 class AuditResultStore:
     def __init__(self) -> None:
-        self._futures: Dict[str, asyncio.Future] = {}
+        self._futures: dict[str, asyncio.Future] = {}
 
     def add_result(self, result: "MessageAuditEvent"):
         audit_id = result.audit_id

nonebot/adapters/qq/utils.py

@@ -1,17 +1,7 @@
 from functools import partial
+from collections.abc import Awaitable
 from typing_extensions import ParamSpec, Concatenate
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    Type,
-    Generic,
-    TypeVar,
-    Callable,
-    Optional,
-    Awaitable,
-    overload,
-)
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, Callable, Optional, overload
 
 from nonebot.utils import logger_wrapper
 
@@ -33,7 +23,7 @@ def unescape(s: str) -> str:
     return s.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&")
 
 
-def exclude_none(data: Dict[str, Any]) -> Dict[str, Any]:
+def exclude_none(data: dict[str, Any]) -> dict[str, Any]:
     return {k: v for k, v in data.items() if v is not None}
 
 
@@ -41,19 +31,19 @@ class API(Generic[B, P, R]):
     def __init__(self, func: Callable[Concatenate[B, P], Awaitable[R]]) -> None:
         self.func = func
 
-    def __set_name__(self, owner: Type[B], name: str) -> None:
+    def __set_name__(self, owner: type[B], name: str) -> None:
         self.name = name
 
     @overload
-    def __get__(self, obj: None, objtype: Type[B]) -> "API[B, P, R]": ...
+    def __get__(self, obj: None, objtype: type[B]) -> "API[B, P, R]": ...
 
     @overload
     def __get__(
-        self, obj: B, objtype: Optional[Type[B]]
+        self, obj: B, objtype: Optional[type[B]]
     ) -> Callable[P, Awaitable[R]]: ...
 
     def __get__(
-        self, obj: Optional[B], objtype: Optional[Type[B]] = None
+        self, obj: Optional[B], objtype: Optional[type[B]] = None
     ) -> "API[B, P, R] | Callable[P, Awaitable[R]]":
         if obj is None:
             return self

{nonebot_adapter_qq-1.5.0.dist-info → nonebot_adapter_qq-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.5.0
+Version: 1.5.2
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT

nonebot_adapter_qq-1.5.2.dist-info/RECORD

@@ -0,0 +1,20 @@
+nonebot/adapters/qq/__init__.py,sha256=jm1QxHfhcYIrWhkXxF9gE4G3lkagrLCWsmVqKBTQSOw,815
+nonebot/adapters/qq/adapter.py,sha256=Fa1dVykpC_-mIVgN7b37k45Ecu3cddt2KWwsZSJqrp4,14591
+nonebot/adapters/qq/bot.py,sha256=AA2eGpTZxHRTj3Z7mzCa3K77QdKSL6O-wTcEJ4F7bmE,61394
+nonebot/adapters/qq/compat.py,sha256=7g5QvRzWREesZ7MSEhNRh53UZwEyhQlxE3e_KpqQ0pw,768
+nonebot/adapters/qq/config.py,sha256=vvTZ4JRJEQ60PyLh92IEnQkOltdUs41lGKZuYXxq6yA,2135
+nonebot/adapters/qq/event.py,sha256=9URqXn-U0K2JwYR1TJkNjejWB1C_-LnflLZPsTNn32I,18802
+nonebot/adapters/qq/exception.py,sha256=8Xa9NwYyO7Ih0owBAC_zmEiIRAA8GjgQcoJcF5ogo0g,2701
+nonebot/adapters/qq/message.py,sha256=q4dhlpuQ-Fyiqj2_cL1TCaZutdF41fcyGXpiI6RucVg,15526
+nonebot/adapters/qq/models/__init__.py,sha256=VsLh2rceTl9fK4hReYXBosOPZj6E1x7lDUdk7py_R8A,579
+nonebot/adapters/qq/models/common.py,sha256=oQDNaPUNUO64-_bgQdHobQyZLdtdDNnkykzGjbRdAUM,4539
+nonebot/adapters/qq/models/guild.py,sha256=8xyFLwXXzIk-LxqzSlkfkuJfPgxxIkLYWsrPRcX4lsM,11686
+nonebot/adapters/qq/models/payload.py,sha256=_Q-4yHlSlzb5Lm2MLv8QxQ_ADVbjWJt3SCWN3_niH-Q,2851
+nonebot/adapters/qq/models/qq.py,sha256=9gPQZBuuZEOvAsk7a6-w0Gh0Scf4qQL9y08pubdfk1o,1853
+nonebot/adapters/qq/permission.py,sha256=0aedypl6xymhAV3UkW0vlvHTBkJeDmOef3SxG2tPcHQ,988
+nonebot/adapters/qq/store.py,sha256=GKVbto6K7jI-oK9tSbw_xLxDiSA6Y9QnNQStKJU7mEY,868
+nonebot/adapters/qq/utils.py,sha256=bzJwm1zWyHjFILr-bHrBKpKlkiveph9S4pLAXMcW9AY,1538
+nonebot_adapter_qq-1.5.2.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
+nonebot_adapter_qq-1.5.2.dist-info/METADATA,sha256=8qgJba66rQN3Cd3OEp_btLfeSIck14KQrMAWKwwE1eg,2735
+nonebot_adapter_qq-1.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nonebot_adapter_qq-1.5.2.dist-info/RECORD,,

nonebot_adapter_qq-1.5.0.dist-info/RECORD

@@ -1,20 +0,0 @@
-nonebot/adapters/qq/__init__.py,sha256=u2bR9HLdgIEV22nu2VJeUFscklTUj8DN4650q0k5SHw,787
-nonebot/adapters/qq/adapter.py,sha256=ivVkSvUFcQEGIp9AmDTwP17HFNnrMmg6LYF1pfORi2s,14464
-nonebot/adapters/qq/bot.py,sha256=GggOMoEp8lHU2O7cRsS-LtmyXu14ijJttjSYcJ9M364,60571
-nonebot/adapters/qq/compat.py,sha256=7g5QvRzWREesZ7MSEhNRh53UZwEyhQlxE3e_KpqQ0pw,768
-nonebot/adapters/qq/config.py,sha256=rdBWweI0db8-9KQF-lvNLMCMa55PJPOkvn9DVJMprac,2148
-nonebot/adapters/qq/event.py,sha256=4VvHq7l5aQYmIEBLpjHrCL_neqYBTximeuPHQHnt384,18754
-nonebot/adapters/qq/exception.py,sha256=8Xa9NwYyO7Ih0owBAC_zmEiIRAA8GjgQcoJcF5ogo0g,2701
-nonebot/adapters/qq/message.py,sha256=JjUeqqMaw3N5-STrcvmjcWNx9VCSBGaLuZB4jg4gpM8,11422
-nonebot/adapters/qq/models/__init__.py,sha256=AahR-O5B_1c8dMXHpDH68o4qojhF3vf4UPDGyH2MKjA,537
-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.5.0.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
-nonebot_adapter_qq-1.5.0.dist-info/METADATA,sha256=2UfZxU96zeAyAqSAyAdQ0K7_mq41IjnG-LzmWIemJNE,2735
-nonebot_adapter_qq-1.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nonebot_adapter_qq-1.5.0.dist-info/RECORD,,