nonebot-adapter-qq 1.5.3__py3-none-any.whl → 1.6.1__py3-none-any.whl

nonebot/adapters/qq/adapter.py

@@ -1,20 +1,28 @@
 import sys
+import json
 import asyncio
+import binascii
 from typing_extensions import override
-from typing import Any, Literal, Optional
+from typing import Any, Union, Literal, Optional, cast
 
 from nonebot.utils import escape_tag
 from nonebot.exception import WebSocketClosed
+from cryptography.exceptions import InvalidSignature
+from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 from nonebot.compat import PYDANTIC_V2, type_validate_json, type_validate_python
 from nonebot.drivers import (
     URL,
     Driver,
     Request,
+    Response,
+    ASGIMixin,
     WebSocket,
     HTTPClientMixin,
+    HTTPServerSetup,
     WebSocketClientMixin,
 )
 
+from nonebot import get_plugin_config
 from nonebot.adapters import Adapter as BaseAdapter
 
 from .bot import Bot
@@ -33,6 +41,7 @@ from .models import (
     Reconnect,
     PayloadType,
     HeartbeatAck,
+    WebhookVerify,
     InvalidSession,
 )
 
@@ -44,7 +53,7 @@ class Adapter(BaseAdapter):
     def __init__(self, driver: Driver, **kwargs: Any):
         super().__init__(driver, **kwargs)
 
-        self.qq_config: Config = Config(**self.config.dict())
+        self.qq_config: Config = get_plugin_config(Config)
 
         self.tasks: set["asyncio.Task"] = set()
         self.setup()
@@ -61,20 +70,29 @@ class Adapter(BaseAdapter):
                 "http client requests! "
                 "QQ Adapter need a HTTPClient Driver to work."
             )
-        if not isinstance(self.driver, WebSocketClientMixin):
+
+        if any(bot.use_websocket for bot in self.qq_config.qq_bots) and not isinstance(
+            self.driver, WebSocketClientMixin
+        ):
             raise RuntimeError(
                 f"Current driver {self.config.driver} does not support "
                 "websocket client! "
                 "QQ Adapter need a WebSocketClient Driver to work."
             )
+
+        if not all(
+            bot.use_websocket for bot in self.qq_config.qq_bots
+        ) and not isinstance(self.driver, ASGIMixin):
+            raise RuntimeError(
+                f"Current driver {self.config.driver} does not support "
+                "ASGI server! "
+                "QQ Adapter need a ASGI Driver to receive webhook."
+            )
         self.on_ready(self.startup)
         self.driver.on_shutdown(self.shutdown)
 
     async def startup(self) -> None:
-        log(
-            "DEBUG",
-            ("QQ run in sandbox mode: " f"<y>{self.qq_config.qq_is_sandbox}</y>"),
-        )
+        log("DEBUG", f"QQ run in sandbox mode: <y>{self.qq_config.qq_is_sandbox}</y>")
 
         try:
             api_base = self.get_api_base()
@@ -84,8 +102,36 @@ class Adapter(BaseAdapter):
 
         log("DEBUG", f"QQ api base url: <y>{escape_tag(str(api_base))}</y>")
 
+        if isinstance(self.driver, ASGIMixin):
+            self.setup_http_server(
+                HTTPServerSetup(
+                    URL("/qq/"),
+                    "POST",
+                    f"{self.get_name()} Root Webhook",
+                    self._handle_http,
+                ),
+            )
+            self.setup_http_server(
+                HTTPServerSetup(
+                    URL("/qq/webhook"),
+                    "POST",
+                    f"{self.get_name()} Webhook",
+                    self._handle_http,
+                ),
+            )
+            self.setup_http_server(
+                HTTPServerSetup(
+                    URL("/qq/webhook/"),
+                    "POST",
+                    f"{self.get_name()} Webhook Slash",
+                    self._handle_http,
+                ),
+            )
+
         for bot in self.qq_config.qq_bots:
-            task = asyncio.create_task(self.run_bot(bot))
+            if not bot.use_websocket:
+                continue
+            task = asyncio.create_task(self.run_bot_websocket(bot))
             task.add_done_callback(self.tasks.discard)
             self.tasks.add(task)
 
@@ -99,7 +145,7 @@ class Adapter(BaseAdapter):
             return_exceptions=True,
         )
 
-    async def run_bot(self, bot_info: BotInfo) -> None:
+    async def run_bot_websocket(self, bot_info: BotInfo) -> None:
         bot = Bot(self, bot_info.id, bot_info)
 
         # get sharded gateway url
@@ -347,20 +393,7 @@ class Adapter(BaseAdapter):
                 f"Received payload: {escape_tag(repr(payload))}",
             )
             if isinstance(payload, Dispatch):
-                try:
-                    event = self.payload_to_event(payload)
-                except Exception as e:
-                    log(
-                        "WARNING",
-                        f"Failed to parse event {escape_tag(repr(payload))}",
-                        e,
-                    )
-                else:
-                    if isinstance(event, MessageAuditEvent):
-                        audit_result.add_result(event)
-                    task = asyncio.create_task(bot.handle_event(event))
-                    task.add_done_callback(self.tasks.discard)
-                    self.tasks.add(task)
+                self.dispatch_event(bot, payload)
             elif isinstance(payload, HeartbeatAck):
                 log("TRACE", "Heartbeat ACK")
                 continue
@@ -383,6 +416,133 @@ class Adapter(BaseAdapter):
                     f"Unknown payload from server: {escape_tag(repr(payload))}",
                 )
 
+    async def receive_payload(self, bot: Bot, ws: WebSocket) -> Payload:
+        return self.data_to_payload(bot, await ws.receive())
+
+    async def _handle_http(self, request: Request) -> Response:
+        bot_id = request.headers.get("X-Bot-Appid")
+        if not bot_id:
+            log("WARNING", "Missing X-Bot-Appid header in request")
+            return Response(403, content="Missing X-Bot-Appid header")
+        elif bot_id in self.bots:
+            bot = cast(Bot, self.bots[bot_id])
+        elif bot_info := next(
+            (bot_info for bot_info in self.qq_config.qq_bots if bot_info.id == bot_id),
+            None,
+        ):
+            bot = Bot(self, bot_id, bot_info)
+        else:
+            log("ERROR", f"Bot {bot_id} not found")
+            return Response(403, content="Bot not found")
+
+        if request.content is None:
+            return Response(400, content="Missing request content")
+
+        try:
+            payload = self.data_to_payload(bot, request.content)
+        except Exception as e:
+            log(
+                "ERROR",
+                "<r><bg #f8bbd0>Error while parsing data from webhook</bg #f8bbd0></r>",
+                e,
+            )
+            return Response(400, content="Invalid request content")
+
+        log(
+            "TRACE",
+            f"Received payload: {escape_tag(repr(payload))}",
+        )
+        if isinstance(payload, WebhookVerify):
+            log("INFO", "Received qq webhook verify request")
+            return self._webhook_verify(bot, payload)
+
+        if self.qq_config.qq_verify_webhook and (
+            response := self._check_signature(bot, request)
+        ):
+            return response
+
+        # ensure bot self info
+        if not bot._self_info:
+            bot.self_info = await bot.me()
+
+        if bot.self_id not in self.bots:
+            self.bot_connect(bot)
+
+        if isinstance(payload, Dispatch):
+            self.dispatch_event(bot, payload)
+
+        return Response(200)
+
+    def _get_ed25519_key(self, bot: Bot) -> Ed25519PrivateKey:
+        secret = bot.bot_info.secret.encode()
+        seed = secret
+        while len(seed) < 32:
+            seed += secret
+        seed = seed[:32]
+        return Ed25519PrivateKey.from_private_bytes(seed)
+
+    def _webhook_verify(self, bot: Bot, payload: WebhookVerify) -> Response:
+        plain_token = payload.data.plain_token
+        event_ts = payload.data.event_ts
+
+        try:
+            private_key = self._get_ed25519_key(bot)
+        except Exception as e:
+            log("ERROR", "Failed to create private key", e)
+            return Response(500, content="Failed to create private key")
+
+        msg = f"{event_ts}{plain_token}".encode()
+        try:
+            signature = private_key.sign(msg)
+            signature_hex = binascii.hexlify(signature).decode()
+        except Exception as e:
+            log("ERROR", "Failed to sign message", e)
+            return Response(500, content="Failed to sign message")
+
+        return Response(
+            200,
+            content=json.dumps(
+                {"plain_token": plain_token, "signature": signature_hex}
+            ),
+        )
+
+    def _check_signature(self, bot: Bot, request: Request) -> Optional[Response]:
+        signature = request.headers.get("X-Signature-Ed25519")
+        timestamp = request.headers.get("X-Signature-Timestamp")
+        if not signature or not timestamp:
+            log("WARNING", "Missing signature or timestamp in request")
+            return Response(403, content="Missing signature or timestamp")
+
+        if request.content is None:
+            return Response(400, content="Missing request content")
+
+        try:
+            private_key = self._get_ed25519_key(bot)
+            public_key = private_key.public_key()
+        except Exception as e:
+            log("ERROR", "Failed to create public key", e)
+            return Response(500, content="Failed to create public key")
+
+        signature = binascii.unhexlify(signature)
+        if len(signature) != 64 or signature[63] & 224 != 0:
+            log("WARNING", "Invalid signature in request")
+            return Response(403, content="Invalid signature")
+
+        body = (
+            request.content.encode()
+            if isinstance(request.content, str)
+            else request.content
+        )
+        msg = timestamp.encode() + body
+        try:
+            public_key.verify(signature, msg)
+        except InvalidSignature:
+            log("WARNING", "Invalid signature in request")
+            return Response(403, content="Invalid signature")
+        except Exception as e:
+            log("ERROR", "Failed to verify signature", e)
+            return Response(403, content="Failed to verify signature")
+
     def get_auth_base(self) -> URL:
         return URL(str(self.qq_config.qq_auth_base))
 
@@ -393,8 +553,8 @@ class Adapter(BaseAdapter):
             return URL(str(self.qq_config.qq_api_base))
 
     @staticmethod
-    async def receive_payload(bot: Bot, ws: WebSocket) -> Payload:
-        payload = type_validate_json(PayloadType, await ws.receive())
+    def data_to_payload(bot: Bot, data: Union[str, bytes]) -> Payload:
+        payload = type_validate_json(PayloadType, data)
         if isinstance(payload, Dispatch):
             bot.on_dispatch(payload)
         return payload
@@ -406,6 +566,22 @@ class Adapter(BaseAdapter):
 
         return payload.json(by_alias=True)
 
+    def dispatch_event(self, bot: Bot, payload: Dispatch):
+        try:
+            event = self.payload_to_event(payload)
+        except Exception as e:
+            log(
+                "WARNING",
+                f"Failed to parse event {escape_tag(repr(payload))}",
+                e,
+            )
+        else:
+            if isinstance(event, MessageAuditEvent):
+                audit_result.add_result(event)
+            task = asyncio.create_task(bot.handle_event(event))
+            task.add_done_callback(self.tasks.discard)
+            self.tasks.add(task)
+
     @staticmethod
     def payload_to_event(payload: Dispatch) -> Event:
         EventClass = EVENT_CLASSES.get(payload.type, None)

nonebot/adapters/qq/bot.py

@@ -200,6 +200,10 @@ class Bot(BaseBot):
             raise RuntimeError(f"Bot {self.bot_info} is not connected!")
         return self._self_info
 
+    @self_info.setter
+    def self_info(self, info: User):
+        self._self_info = info
+
     @property
     def ready(self) -> bool:
         """Bot 是否已经准备就绪"""
@@ -259,16 +263,14 @@ class Bot(BaseBot):
 
     async def _get_authorization_header(self) -> str:
         """获取当前 Bot 的鉴权信息"""
-        if self.bot_info.is_group_bot:
-            return f"QQBot {await self.get_access_token()}"
-        return f"Bot {self.bot_info.id}.{self.bot_info.token}"
+        return f"QQBot {await self.get_access_token()}"
 
     async def get_authorization_header(self) -> dict[str, str]:
         """获取当前 Bot 的鉴权信息"""
-        headers = {"Authorization": await self._get_authorization_header()}
-        if self.bot_info.is_group_bot:
-            headers["X-Union-Appid"] = self.bot_info.id
-        return headers
+        return {
+            "Authorization": await self._get_authorization_header(),
+            "X-Union-Appid": self.bot_info.id,
+        }
 
     async def handle_event(self, event: Event) -> None:
         if isinstance(event, (GuildMessageEvent, QQMessageEvent)):
@@ -283,9 +285,11 @@ class Bot(BaseBot):
         return _message
 
     @staticmethod
-    def _extract_send_message(message: Message) -> dict[str, Any]:
+    def _extract_send_message(
+        message: Message, escape_text: bool = True
+    ) -> dict[str, Any]:
         kwargs = {}
-        content = message.extract_content() or None
+        content = message.extract_content(escape_text) or None
         kwargs["content"] = content
         if embed := (message["embed"] or None):
             kwargs["embed"] = embed[-1].data["embed"]
@@ -349,7 +353,7 @@ class Bot(BaseBot):
             guild_id=guild_id,
             msg_id=msg_id,
             event_id=event_id,
-            **self._extract_send_message(message=message),
+            **self._extract_send_message(message=message, escape_text=True),
             **self._extract_guild_image(message=message),
         )
 
@@ -365,7 +369,7 @@ class Bot(BaseBot):
             channel_id=channel_id,
             msg_id=msg_id,
             event_id=event_id,
-            **self._extract_send_message(message=message),
+            **self._extract_send_message(message=message, escape_text=True),
             **self._extract_guild_image(message=message),
         )
 
@@ -378,7 +382,7 @@ class Bot(BaseBot):
         event_id: Optional[str] = None,
     ) -> Union[PostC2CMessagesReturn, PostC2CFilesReturn]:
         message = self._prepare_message(message)
-        kwargs = self._extract_send_message(message=message)
+        kwargs = self._extract_send_message(message=message, escape_text=False)
         if kwargs.get("embed"):
             msg_type = 4
         elif kwargs.get("ark"):
@@ -427,7 +431,7 @@ class Bot(BaseBot):
         event_id: Optional[str] = None,
     ) -> Union[PostGroupMessagesReturn, PostGroupFilesReturn]:
         message = self._prepare_message(message)
-        kwargs = self._extract_send_message(message=message)
+        kwargs = self._extract_send_message(message=message, escape_text=False)
         if kwargs.get("embed"):
             msg_type = 4
         elif kwargs.get("ark"):
@@ -566,9 +570,6 @@ class Bot(BaseBot):
         try:
             return self._handle_response(response)
         except UnauthorizedException as e:
-            if not self.bot_info.is_group_bot:
-                raise
-
             log("DEBUG", "Access token expired, try to refresh it.")
 
             # try to refresh access token

nonebot/adapters/qq/compat.py

@@ -2,7 +2,7 @@ from typing import Literal, overload
 
 from nonebot.compat import PYDANTIC_V2
 
-__all__ = ("model_validator", "field_validator")
+__all__ = ("field_validator", "model_validator")
 
 if PYDANTIC_V2:
     from pydantic import field_validator as field_validator
@@ -19,5 +19,5 @@ else:
     def model_validator(*, mode: Literal["before", "after"]):
         return root_validator(pre=mode == "before", allow_reuse=True)
 
-    def field_validator(__field, *fields, mode: Literal["before", "after"] = "after"):
-        return validator(__field, *fields, pre=mode == "before", allow_reuse=True)
+    def field_validator(field, /, *fields, mode: Literal["before", "after"] = "after"):
+        return validator(field, *fields, pre=mode == "before", allow_reuse=True)

nonebot/adapters/qq/config.py

@@ -43,11 +43,6 @@ class Intents(BaseModel):
             | self.at_messages << 30
         )
 
-    @property
-    def is_group_enabled(self) -> bool:
-        """是否开启群聊功能"""
-        return self.c2c_group_at_messages is True
-
 
 class BotInfo(BaseModel):
     id: str = Field(alias="id")
@@ -55,16 +50,13 @@ class BotInfo(BaseModel):
     secret: str = Field(alias="secret")
     shard: Optional[tuple[int, int]] = None
     intent: Intents = Field(default_factory=Intents)
-
-    @property
-    def is_group_bot(self) -> bool:
-        """是否为群机器人"""
-        return self.intent.is_group_enabled
+    use_websocket: bool = True
 
 
 class Config(BaseModel):
     qq_is_sandbox: bool = False
-    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_api_base: HttpUrl = Field("https://api.sgroup.qq.com/")  # type: ignore
+    qq_sandbox_api_base: HttpUrl = Field("https://sandbox.api.sgroup.qq.com")  # type: ignore
+    qq_auth_base: HttpUrl = Field("https://bots.qq.com/app/getAppAccessToken")  # type: ignore
+    qq_verify_webhook: bool = True
     qq_bots: list[BotInfo] = Field(default_factory=list)

nonebot/adapters/qq/event.py

@@ -680,75 +680,75 @@ class GroupMsgReceiveEvent(GroupRobotEvent):
 
 __all__ = [
     "EVENT_CLASSES",
-    "EventType",
+    "AtMessageCreateEvent",
+    "AudioEvent",
+    "AudioFinishEvent",
+    "AudioOffMicEvent",
+    "AudioOnMicEvent",
+    "AudioStartEvent",
+    "C2CMessageCreateEvent",
+    "C2CMsgReceiveEvent",
+    "C2CMsgRejectEvent",
+    "ChannelCreateEvent",
+    "ChannelDeleteEvent",
+    "ChannelEvent",
+    "ChannelUpdateEvent",
+    "DirectMessageCreateEvent",
+    "DirectMessageDeleteEvent",
     "Event",
-    "MetaEvent",
-    "ReadyEvent",
-    "ResumedEvent",
-    "NoticeEvent",
-    "GuildEvent",
+    "EventType",
+    "ForumEvent",
+    "ForumPostCreateEvent",
+    "ForumPostDeleteEvent",
+    "ForumPostEvent",
+    "ForumPublishAuditResult",
+    "ForumReplyCreateEvent",
+    "ForumReplyDeleteEvent",
+    "ForumReplyEvent",
+    "ForumThreadCreateEvent",
+    "ForumThreadDeleteEvent",
+    "ForumThreadEvent",
+    "ForumThreadUpdateEvent",
+    "FriendAddEvent",
+    "FriendDelEvent",
+    "FriendRobotEvent",
+    "GroupAddRobotEvent",
+    "GroupAtMessageCreateEvent",
+    "GroupDelRobotEvent",
+    "GroupMsgReceiveEvent",
+    "GroupMsgRejectEvent",
+    "GroupRobotEvent",
     "GuildCreateEvent",
-    "GuildUpdateEvent",
     "GuildDeleteEvent",
-    "ChannelEvent",
-    "ChannelCreateEvent",
-    "ChannelUpdateEvent",
-    "ChannelDeleteEvent",
-    "GuildMemberEvent",
+    "GuildEvent",
     "GuildMemberAddEvent",
-    "GuildMemberUpdateEvent",
+    "GuildMemberEvent",
     "GuildMemberRemoveEvent",
-    "MessageEvent",
+    "GuildMemberUpdateEvent",
     "GuildMessageEvent",
-    "MessageCreateEvent",
-    "MessageDeleteEvent",
-    "AtMessageCreateEvent",
-    "PublicMessageDeleteEvent",
-    "DirectMessageCreateEvent",
-    "DirectMessageDeleteEvent",
-    "QQMessageEvent",
-    "C2CMessageCreateEvent",
-    "GroupAtMessageCreateEvent",
+    "GuildUpdateEvent",
     "InteractionCreateEvent",
     "MessageAuditEvent",
     "MessageAuditPassEvent",
     "MessageAuditRejectEvent",
-    "MessageReactionEvent",
+    "MessageCreateEvent",
+    "MessageDeleteEvent",
+    "MessageEvent",
     "MessageReactionAddEvent",
+    "MessageReactionEvent",
     "MessageReactionRemoveEvent",
-    "AudioEvent",
-    "AudioStartEvent",
-    "AudioFinishEvent",
-    "AudioOnMicEvent",
-    "AudioOffMicEvent",
-    "ForumEvent",
-    "ForumThreadEvent",
-    "ForumThreadCreateEvent",
-    "ForumThreadUpdateEvent",
-    "ForumThreadDeleteEvent",
-    "ForumPostEvent",
-    "ForumPostCreateEvent",
-    "ForumPostDeleteEvent",
-    "ForumReplyEvent",
-    "ForumReplyCreateEvent",
-    "ForumReplyDeleteEvent",
-    "ForumPublishAuditResult",
+    "MetaEvent",
+    "NoticeEvent",
     "OpenForumEvent",
-    "OpenForumThreadCreateEvent",
-    "OpenForumThreadUpdateEvent",
-    "OpenForumThreadDeleteEvent",
     "OpenForumPostCreateEvent",
     "OpenForumPostDeleteEvent",
     "OpenForumReplyCreateEvent",
     "OpenForumReplyDeleteEvent",
-    "FriendRobotEvent",
-    "FriendAddEvent",
-    "FriendDelEvent",
-    "C2CMsgRejectEvent",
-    "C2CMsgReceiveEvent",
-    "GroupRobotEvent",
-    "GroupAddRobotEvent",
-    "GroupDelRobotEvent",
-    "GroupMsgRejectEvent",
-    "GroupMsgReceiveEvent",
+    "OpenForumThreadCreateEvent",
+    "OpenForumThreadDeleteEvent",
+    "OpenForumThreadUpdateEvent",
+    "PublicMessageDeleteEvent",
+    "QQMessageEvent",
+    "ReadyEvent",
+    "ResumedEvent",
 ]

nonebot/adapters/qq/message.py

@@ -532,9 +532,9 @@ class Message(BaseMessage[MessageSegment]):
             )
         return msg
 
-    def extract_content(self) -> str:
+    def extract_content(self, escape_text: bool = True) -> str:
         return "".join(
-            str(seg)
+            seg.data["text"] if not escape_text and seg.type == "text" else str(seg)
             for seg in self
             if seg.type
             in ("text", "emoji", "mention_user", "mention_everyone", "mention_channel")

nonebot/adapters/qq/models/__init__.py

@@ -11,4 +11,5 @@ from .payload import Heartbeat as Heartbeat
 from .payload import Reconnect as Reconnect
 from .payload import PayloadType as PayloadType
 from .payload import HeartbeatAck as HeartbeatAck
+from .payload import WebhookVerify as WebhookVerify
 from .payload import InvalidSession as InvalidSession

nonebot/adapters/qq/models/common.py

@@ -165,26 +165,26 @@ class ButtonInteraction(BaseModel):
 
 
 __all__ = [
+    "Action",
+    "Button",
+    "ButtonInteraction",
+    "ButtonInteractionContent",
+    "ButtonInteractionData",
+    "InlineKeyboard",
+    "InlineKeyboardRow",
+    "MessageArk",
+    "MessageArkKv",
+    "MessageArkObj",
+    "MessageArkObjKv",
     "MessageAttachment",
-    "MessageEmbedThumbnail",
-    "MessageEmbedField",
+    "MessageAudited",
     "MessageEmbed",
-    "MessageArkObjKv",
-    "MessageArkObj",
-    "MessageArkKv",
-    "MessageArk",
-    "MessageReference",
-    "MessageMarkdownParams",
+    "MessageEmbedField",
+    "MessageEmbedThumbnail",
+    "MessageKeyboard",
     "MessageMarkdown",
+    "MessageMarkdownParams",
+    "MessageReference",
     "Permission",
-    "Action",
     "RenderData",
-    "Button",
-    "InlineKeyboardRow",
-    "InlineKeyboard",
-    "MessageKeyboard",
-    "MessageAudited",
-    "ButtonInteractionContent",
-    "ButtonInteractionData",
-    "ButtonInteraction",
 ]

nonebot/adapters/qq/models/guild.py

@@ -498,67 +498,67 @@ class ShardUrlGetReturn(BaseModel):
 
 
 __all__ = [
-    "Guild",
-    "User",
-    "ChannelType",
-    "ChannelSubType",
-    "PrivateType",
-    "SpeakPermission",
+    "DMS",
+    "APIPermission",
+    "APIPermissionDemand",
+    "APIPermissionDemandIdentify",
+    "Alignment",
+    "Announces",
+    "AudioAction",
+    "AudioControl",
+    "AudioStatus",
     "Channel",
-    "Member",
-    "GetRoleMembersReturn",
-    "Role",
-    "GetGuildRolesReturn",
-    "PostGuildRoleReturn",
-    "PatchGuildRoleReturn",
     "ChannelPermissions",
+    "ChannelSubType",
+    "ChannelType",
+    "Elem",
+    "ElemType",
+    "Emoji",
+    "EmojiType",
+    "ForumAuditResult",
+    "ForumAuditType",
+    "ForumSourceInfo",
+    "GetGuildAPIPermissionReturn",
+    "GetGuildRolesReturn",
+    "GetReactionUsersReturn",
+    "GetRoleMembersReturn",
+    "GetThreadReturn",
+    "GetThreadsListReturn",
+    "Guild",
+    "ImageElem",
+    "Member",
     "Message",
     "MessageDelete",
+    "MessageReaction",
     "MessageSetting",
-    "DMS",
-    "RecommendChannel",
-    "Announces",
+    "Paragraph",
+    "ParagraphProps",
+    "PatchGuildRoleReturn",
     "PinsMessage",
+    "Post",
+    "PostGuildRoleReturn",
+    "PostInfo",
+    "PrivateType",
+    "PutThreadReturn",
+    "ReactionTarget",
+    "ReactionTargetType",
+    "RecommendChannel",
     "RemindType",
+    "Reply",
+    "ReplyInfo",
+    "RichText",
+    "Role",
     "Schedule",
-    "EmojiType",
-    "Emoji",
-    "ReactionTargetType",
-    "ReactionTarget",
-    "MessageReaction",
-    "GetReactionUsersReturn",
-    "AudioStatus",
-    "AudioControl",
-    "AudioAction",
-    "ElemType",
-    "TextProps",
+    "SessionStartLimit",
+    "ShardUrlGetReturn",
+    "SpeakPermission",
     "TextElem",
-    "ImageElem",
-    "VideoElem",
-    "URLElem",
-    "Elem",
-    "Alignment",
-    "ParagraphProps",
-    "Paragraph",
-    "RichText",
-    "ThreadObjectInfo",
-    "ThreadInfo",
-    "ForumSourceInfo",
+    "TextProps",
     "Thread",
-    "PostInfo",
-    "Post",
-    "ReplyInfo",
-    "Reply",
-    "ForumAuditType",
-    "ForumAuditResult",
-    "GetThreadsListReturn",
-    "GetThreadReturn",
-    "PutThreadReturn",
-    "APIPermission",
-    "APIPermissionDemandIdentify",
-    "APIPermissionDemand",
-    "GetGuildAPIPermissionReturn",
+    "ThreadInfo",
+    "ThreadObjectInfo",
+    "URLElem",
     "UrlGetReturn",
-    "SessionStartLimit",
-    "ShardUrlGetReturn",
+    "User",
+    "VideoElem",
 ]

nonebot/adapters/qq/models/payload.py

@@ -18,6 +18,7 @@ class Opcode(IntEnum):
     HELLO = 10
     HEARTBEAT_ACK = 11
     HTTP_CALLBACK_ACK = 12
+    WEBHOOK_VERIFY = 13
 
 
 class Payload(BaseModel):
@@ -41,7 +42,7 @@ class Payload(BaseModel):
 class Dispatch(Payload):
     opcode: Literal[Opcode.DISPATCH] = Field(Opcode.DISPATCH)
     data: dict
-    sequence: int
+    sequence: Optional[int] = None
     type: str
     id: Optional[str] = None
 
@@ -121,9 +122,26 @@ class HTTPCallbackAck(Payload):
     data: int
 
 
+class WebhookVerifyData(BaseModel):
+    plain_token: str
+    event_ts: str
+
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(extra="allow")
+    else:
+
+        class Config:
+            extra = "allow"
+
+
+class WebhookVerify(Payload):
+    opcode: Literal[Opcode.WEBHOOK_VERIFY] = Field(Opcode.WEBHOOK_VERIFY)
+    data: WebhookVerifyData
+
+
 PayloadType = Union[
     Annotated[
-        Union[Dispatch, Reconnect, InvalidSession, Hello, HeartbeatAck],
+        Union[Dispatch, Reconnect, InvalidSession, Hello, HeartbeatAck, WebhookVerify],
         Field(discriminator="opcode"),
     ],
     Payload,

nonebot/adapters/qq/models/qq.py

@@ -10,11 +10,13 @@ from nonebot.adapters.qq.compat import field_validator
 class FriendAuthor(BaseModel):
     id: str
     user_openid: str
+    union_openid: Optional[str] = None
 
 
 class GroupMemberAuthor(BaseModel):
     id: str
     member_openid: str
+    union_openid: Optional[str] = None
 
 
 class Attachment(BaseModel):
@@ -76,15 +78,15 @@ class PostGroupMembersReturn(BaseModel):
 
 
 __all__ = [
+    "Attachment",
     "FriendAuthor",
+    "GroupMember",
     "GroupMemberAuthor",
-    "Attachment",
     "Media",
-    "QQMessage",
-    "PostC2CMessagesReturn",
-    "PostGroupMessagesReturn",
     "PostC2CFilesReturn",
-    "GroupMember",
-    "PostGroupMembersReturn",
+    "PostC2CMessagesReturn",
     "PostGroupFilesReturn",
+    "PostGroupMembersReturn",
+    "PostGroupMessagesReturn",
+    "QQMessage",
 ]

nonebot/adapters/qq/permission.py

@@ -6,7 +6,7 @@ from .event import MessageCreateEvent, AtMessageCreateEvent
 
 
 async def _guild_channel_admin(
-    event: Union[AtMessageCreateEvent, MessageCreateEvent]
+    event: Union[AtMessageCreateEvent, MessageCreateEvent],
 ) -> bool:
     return "5" in getattr(event.member, "roles", ())
 
@@ -27,7 +27,7 @@ GUILD_OWNER: Permission = Permission(_guild_owner)
 """匹配任意频道群主群消息类型事件"""
 
 __all__ = [
-    "GUILD_CHANNEL_ADMIN",
     "GUILD_ADMIN",
+    "GUILD_CHANNEL_ADMIN",
     "GUILD_OWNER",
 ]

{nonebot_adapter_qq-1.5.3.dist-info → nonebot_adapter_qq-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: nonebot-adapter-qq
-Version: 1.5.3
+Version: 1.6.1
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: cryptography (>=43.0.3,<45.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)
@@ -45,15 +46,19 @@ _✨ QQ 协议适配 ✨_
 
 ### Driver
 
-参考 [driver](https://nonebot.dev/docs/appendices/config#driver) 配置项，添加 `HTTPClient` 和 `WebSocketClient` 支持。
-
-如：
+如果使用 WebSocket 连接方式，请参考 [driver](https://nonebot.dev/docs/appendices/config#driver) 配置项，添加 `HTTPClient` 和 `WebSocketClient` 支持。如：
 
 ```dotenv
 DRIVER=~httpx+~websockets
 DRIVER=~aiohttp
 ```
 
+如果使用 WebHook 连接方式，则添加 `ASGIServer` 支持。如：
+
+```dotenv
+DRIVER=~fastapi
+```
+
 ### QQ_IS_SANDBOX
 
 是否为沙盒模式，默认为 `False`。
@@ -66,9 +71,13 @@ QQ_IS_SANDBOX=true
 
 配置机器人帐号 `id` `token` `secret`，intent 需要根据机器人类型以及需要的事件进行配置。
 
+#### Webhook / WebSocket
+
+通过配置项 `use_websocket` 来选择是否启用 WebSocket 连接，当前默认为 `True`。如果关闭 WebSocket 连接方式，则可以通过 WebHook 方式来连接机器人，请在 QQ 开放平台中配置机器人回调地址：`https://host:port/qq/webhook`。
+
 #### Intent
 
-以下为所有 Intent 配置项以及默认值：
+Intent 仅对 WebSocket 连接方式生效。以下为所有 Intent 配置项以及默认值：
 
 ```json
 {
@@ -102,7 +111,8 @@ QQ_BOTS='
     "intent": {
       "guild_messages": true,
       "at_messages": false
-    }
+    },
+    "use_websocket": false
   }
 ]
 '
@@ -119,7 +129,8 @@ QQ_BOTS='
     "secret": "xxx",
     "intent": {
       "c2c_group_at_messages": true
-    }
+    },
+    "use_websocket": false
   }
 ]
 '

nonebot_adapter_qq-1.6.1.dist-info/RECORD

@@ -0,0 +1,20 @@
+nonebot/adapters/qq/__init__.py,sha256=jm1QxHfhcYIrWhkXxF9gE4G3lkagrLCWsmVqKBTQSOw,815
+nonebot/adapters/qq/adapter.py,sha256=UwAjO168oWmvb3frjay4CTC54xq3hsCiVbeFxRwaGxI,21243
+nonebot/adapters/qq/bot.py,sha256=eYW4j4Vc0IBGmpZATal-zpq1BVjWrwL-Ff9Fy2tTWIM,61383
+nonebot/adapters/qq/compat.py,sha256=Fr96IgBHHiEqGm8DVmlTekuaNdI5EPxti7J7HDwOHwg,767
+nonebot/adapters/qq/config.py,sha256=YRVpGNvslGcNHNbbFN9LOjZ98-yon5x9GMF98FVJ2xo,1974
+nonebot/adapters/qq/event.py,sha256=3A78iz-G6wC-KsW5gYQM16veqgCtjWWsb8AysXhDOK4,18802
+nonebot/adapters/qq/exception.py,sha256=8Xa9NwYyO7Ih0owBAC_zmEiIRAA8GjgQcoJcF5ogo0g,2701
+nonebot/adapters/qq/message.py,sha256=74H7L3FTpZu5GAm4j3wnVYf7wJQ_kP9HHjqaXn3uRTQ,15616
+nonebot/adapters/qq/models/__init__.py,sha256=q2OhopcTn0UD2wuep_86dXMVhF_wQBzBDhyGLN1q0OE,631
+nonebot/adapters/qq/models/common.py,sha256=Hoot6Qr3PGj13G4Cz2Eyr-liaLiJXBpxpeM59IXBri0,4539
+nonebot/adapters/qq/models/guild.py,sha256=uKvSijWFMJ0x26Gd04b8QbUr8IOIn3U3m1d-I6xTrcI,11686
+nonebot/adapters/qq/models/payload.py,sha256=IhAx2W5rN8ihg2NchQ9rJMfcxDecwnnJ-5_N-ky8deM,3261
+nonebot/adapters/qq/models/qq.py,sha256=JH-1tC7ujwHpuJtPefGOJh2NQjrxAL7L-aRyu7xqplU,1931
+nonebot/adapters/qq/permission.py,sha256=Jw00btklCMviP001MBlLQmqThb9OsjJwHO1nTEDFRWM,989
+nonebot/adapters/qq/store.py,sha256=GKVbto6K7jI-oK9tSbw_xLxDiSA6Y9QnNQStKJU7mEY,868
+nonebot/adapters/qq/utils.py,sha256=bzJwm1zWyHjFILr-bHrBKpKlkiveph9S4pLAXMcW9AY,1538
+nonebot_adapter_qq-1.6.1.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
+nonebot_adapter_qq-1.6.1.dist-info/METADATA,sha256=nAY5TQGs53DbKIJTI9dO-A0k4bh6hfyQ8UJjfaEi7ss,3383
+nonebot_adapter_qq-1.6.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+nonebot_adapter_qq-1.6.1.dist-info/RECORD,,

{nonebot_adapter_qq-1.5.3.dist-info → nonebot_adapter_qq-1.6.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any

nonebot_adapter_qq-1.5.3.dist-info/RECORD

@@ -1,20 +0,0 @@
-nonebot/adapters/qq/__init__.py,sha256=jm1QxHfhcYIrWhkXxF9gE4G3lkagrLCWsmVqKBTQSOw,815
-nonebot/adapters/qq/adapter.py,sha256=mK_lTLADDyV-rXDlsgb4noYeJNnxlHxf-iWZBvxU9uY,14935
-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.3.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
-nonebot_adapter_qq-1.5.3.dist-info/METADATA,sha256=VriHr0yg5zp4oD6wVkuN0oRgs5XhY3OJry1uNxRlIts,2786
-nonebot_adapter_qq-1.5.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-nonebot_adapter_qq-1.5.3.dist-info/RECORD,,