⬆️ upgrade adapter qq

resolve [Feature] 关于qq适配器GroupMessageCreateEvent消息类的适配
Fixes #143

Author: RF-Tar-Railt

pdm.lock

@@ -3,12 +3,12 @@ name = "nonebot-plugin-alconna"
 description = "Alconna Adapter for Nonebot"
 authors = [{ name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" }]
 dependencies = [
-    "tarina<0.8.0,>=0.7.3",
-    "nepattern<1.0,>=0.7.7",
-    "arclet-alconna<2.0,>=1.8.43",
+    "tarina>=0.7.5",
+    "nepattern>=0.7.8",
+    "arclet-alconna>=1.8.44",
     "arclet-alconna-tools>=0.7.12",
-    "importlib-metadata>=8.7.0",
-    "nonebot2>=2.4.3",
+    "importlib-metadata>=9.0.0",
+    "nonebot2>=2.5.0",
     "nonebot-plugin-waiter>=0.8.1",
 ]
 dynamic = ["version"]
@@ -182,30 +182,30 @@ asyncio_default_fixture_loop_scope = "session"
 
 [dependency-groups]
 dev = [
-    "black>=25.9.0",
+    "black>=26.5.1",
     "loguru>=0.7.3",
-    "ruff>=0.14.0",
+    "ruff>=0.15.14",
     "nonemoji>=0.1.4",
-    "pre-commit>=4.3.0",
-    "nonebug>=0.4.3",
+    "pre-commit>=4.6.0",
+    "nonebug>=0.4.4",
     "pytest-xdist>=3.8.0",
-    "fastapi>=0.119.0",
-    "uvicorn[standard]>=0.37.0",
-    "pydantic>=2.12.1",
-    "nonebot2[httpx,websockets]>=2.4.3",
-    "nonebot-adapter-console<0.10.0,>=0.9.0",
+    "fastapi>=0.136.1",
+    "uvicorn[standard]>=0.47.0",
+    "pydantic>=2.13.4",
+    "nonebot2[httpx,websockets]>=2.5.0",
+    "nonebot-adapter-console>=0.10.0",
     "nonebot-adapter-ding>=2.0.0a16",
-    "nonebot-adapter-discord>=1.1.3",
+    "nonebot-adapter-discord>=1.1.7",
     "nonebot-adapter-dodo>=0.2.1",
-    "nonebot-adapter-feishu>=2.6.2",
+    "nonebot-adapter-feishu>=2.7.2",
     "nonebot-adapter-kaiheila>=0.3.4",
     "nonebot-adapter-mail>=1.0.0a7",
     "nonebot-adapter-mirai>=2.3.3",
-    "nonebot-adapter-minecraft>=1.8.0",
+    "nonebot-adapter-minecraft>=1.8.1",
     "nonebot-adapter-onebot>=2.4.6",
-    "nonebot-adapter-qq>=1.6.6",
+    "nonebot-adapter-qq>=1.7.1",
     "nonebot-adapter-red>=0.9.0",
-    "nonebot-adapter-satori>=0.13.7",
+    "nonebot-adapter-satori>=1.3.0",
     "nonebot-adapter-telegram>=0.1.0b20",
     "nonebot-adapter-kritor>=0.3.2",
     "nonebot-adapter-tailchat>=0.1.0b13",
@@ -217,24 +217,24 @@ dev = [
     "nonebot-plugin-localstore>=0.7.4",
     "pyyaml>=6.0.3",
     "fix-future-annotations>=0.5.0",
-    "nonebot-adapter-milky>=1.1.0",
+    "nonebot-adapter-milky>=1.2.0",
     "nonebot-adapter-efchat>=0.1.9.post2",
-    "pytest-asyncio==0.26.0",
-    "nonebot-adapter-bilibili-live>=0.2.4",
+    "pytest-asyncio>=1.3.0",
+    "nonebot-adapter-bilibili-live>=0.2.5",
     "nonebot-adapter-yunhu>=0.1.6",
     "nonebot-adapter-vocechat>=0.1.8",
 ]
 test = [
-    "nonebug>=0.4.3",
+    "nonebug>=0.4.4",
     "pytest-xdist>=3.8.0",
-    "pytest-asyncio==0.26.0",
-    "fastapi>=0.119.0",
-    "uvicorn[standard]>=0.37.0",
-    "nonebot2[httpx,websockets]>=2.4.3",
-    "nonebot-adapter-qq>=1.6.6",
+    "pytest-asyncio>=1.3.0",
+    "fastapi>=0.136.1",
+    "uvicorn[standard]>=0.47.0",
+    "nonebot2[httpx,websockets]>=2.5.0",
+    "nonebot-adapter-qq>=1.7.1",
     "nonebot-adapter-satori>=1.3.0",
-    "nonebot-adapter-discord>=1.1.3",
-    "nonebot-adapter-minecraft>=1.8.0",
+    "nonebot-adapter-discord>=1.1.7",
+    "nonebot-adapter-minecraft>=1.8.1",
     "nonebot-adapter-onebot>=2.4.6",
     "nonebot-plugin-filehost>=1.1.1",
     "nonebot-plugin-send-anything-anywhere>=0.7.1",
@@ -244,5 +244,5 @@ test = [
     "pyyaml>=6.0.3",
     "nonebot-adapter-telegram>=0.1.0b20",
     "nonebot-adapter-kaiheila>=0.3.4",
-    "nonebot-adapter-console<0.10.0,>=0.9.0",
+    "nonebot-adapter-console>=0.10.0",
 ]

pyproject.toml

@@ -128,7 +128,7 @@ def __init__(
                     else:
                         command.prefixes = list(global_config.command_start)
             if (config.alconna_use_command_sep if use_cmd_sep is None else use_cmd_sep) and global_config.command_sep:
-                with command_manager.update(command):
+                with command_manager.update(command) as _:
                     command.separators = "".join(global_config.command_sep)
             if config.alconna_context_style:
                 with command_manager.update(command):

src/nonebot_plugin_alconna/rule.py

@@ -130,8 +130,8 @@ def __init__(
             origin=Text,
             previous=text,
             converter=lambda _, x: (
-                x if x.styles and all(set(style).issuperset(_.expected) for style in x.styles.values()) else None
-            ),  # type: ignore  # noqa: E501
+                x if x.styles and all(set(style).issuperset(_.expected) for style in x.styles.values()) else None  # type: ignore  # noqa: E501
+            ),
             alias=expect.capitalize(),
         )
         self.pattern = expect

src/nonebot_plugin_alconna/typings.py

@@ -1,8 +1,8 @@
 from nonebot.adapters import Bot, Event
-from nonebot.adapters.github.event import (
-    CommitCommentCreated,  # type: ignore
-    IssueCommentCreated,  # type: ignore
-    PullRequestReviewCommentCreated,  # type: ignore
+from nonebot.adapters.github.event import (  # type: ignore
+    CommitCommentCreated,
+    IssueCommentCreated,
+    PullRequestReviewCommentCreated,
 )
 from nonebot.adapters.github.message import Message, MessageSegment  # type: ignore
 

src/nonebot_plugin_alconna/uniseg/adapters/github/exporter.py

@@ -7,11 +7,13 @@
 from nonebot.adapters.qq.message import Emoji as EmojiSegment
 from nonebot.adapters.qq.message import Keyboard as KeyboardSegment
 from nonebot.adapters.qq.message import Markdown as MarkdownSegment
+from nonebot.adapters.qq.message import Message as QQMessage
 from nonebot.adapters.qq.message import MentionChannel as MentionChannelSegment
 from nonebot.adapters.qq.message import MentionEveryone as MentionEveryoneSegment
 from nonebot.adapters.qq.message import MentionUser as MentionUserSegment
 from nonebot.adapters.qq.message import Reference as ReferenceSegment
 from nonebot.adapters.qq.models import Message as GuildMessage
+from nonebot.adapters.qq.models import QQReplyMessage
 from nonebot.compat import model_dump
 
 from nonebot_plugin_alconna.uniseg.builder import MessageBuilder, build
@@ -32,6 +34,15 @@
 )
 
 
+style_dict = {
+    0: "secondary", 
+    1: "primary",
+    2: "info",
+    3: "danger",
+    4: "link",
+}
+
+
 class QQMessageBuilder(MessageBuilder):
     @classmethod
     def get_adapter(cls) -> SupportAdapter:
@@ -45,7 +56,7 @@ def markdown(self, seg: MarkdownSegment):
 
     @build("mention_user")
     def mention(self, seg: MentionUserSegment):
-        return At("user", seg.data["user_id"])
+        return At("user", seg.data["user_id"], seg.data.get("username"))
 
     @build("mention_channel")
     def mention_channel(self, seg: MentionChannelSegment):
@@ -157,7 +168,7 @@ def keyboard(self, seg: KeyboardSegment):
                         clicked_label=button.render_data.visited_label,
                         url=button.action.data if button.action.type == 0 else None,
                         text=button.action.data if button.action.type == 2 else None,
-                        style="grey" if button.render_data.style == 0 else "blue",
+                        style=style_dict.get(button.render_data.style or 0, "grey"),
                         permission=perm,
                     )
                 )
@@ -167,11 +178,8 @@ async def extract_reply(self, event: Event, bot: Bot):
         if TYPE_CHECKING:
             assert isinstance(event, (GuildMessageEvent, QQMessageEvent))
         if rpl := getattr(event, "reply", None):
-            if TYPE_CHECKING:
-                assert isinstance(rpl, GuildMessage)
-            return Reply(
-                str(rpl.id),
-                rpl.content,
-                rpl,
-            )
+            if isinstance(rpl, GuildMessage):
+                return Reply(str(rpl.id), rpl.content, origin=rpl)
+            if isinstance(rpl, QQReplyMessage):
+                return Reply(str(rpl.msg_idx), QQMessage.from_qq_message(rpl), origin=rpl)
         return None

src/nonebot_plugin_alconna/uniseg/adapters/qq/builder.py

@@ -11,7 +11,7 @@
     DirectMessageCreateEvent,
     ForumEvent,
     FriendRobotEvent,
-    GroupAtMessageCreateEvent,
+    GroupMessageCreateEvent,
     GroupRobotEvent,
     GuildEvent,
     GuildMemberEvent,
@@ -33,7 +33,7 @@
 )
 from nonebot.adapters.qq.models.common import Button as ButtonModel
 from nonebot.adapters.qq.models.guild import Message as GuildMessage
-from tarina import lang
+from tarina import LRU, lang
 
 from nonebot_plugin_alconna.uniseg.constraint import SupportScope
 from nonebot_plugin_alconna.uniseg.exporter import MessageExporter, SerializeFailed, SupportAdapter, Target, export
@@ -53,6 +53,19 @@
 )
 
 
+style_dict = {
+    "grey": 0,
+    "secondary": 0,
+    "blue": 1,
+    "primary": 1,
+    "success": 1,
+    "info": 2,
+    "warning": 3,
+    "danger": 3,
+    "link": 4,
+}
+
+
 @dataclass
 class ButtonSegment(MessageSegment):
     @override
@@ -68,6 +81,10 @@ def __str__(self) -> str:
 
 
 class QQMessageExporter(MessageExporter[Message]):
+    def __init__(self):
+        super().__init__()
+        self.id_ref_cache = LRU(16)
+
     @classmethod
     def get_adapter(cls) -> SupportAdapter:
         return SupportAdapter.qq
@@ -160,7 +177,7 @@ def get_target(self, event: Event, bot: Bot | None = None) -> Target:
                 extra={"qq.reply_seq": event._reply_seq},
                 scope=SupportScope.qq_api,
             )
-        if isinstance(event, GroupAtMessageCreateEvent):
+        if isinstance(event, GroupMessageCreateEvent):
             return Target(
                 event.group_openid,
                 source=str(event.id),
@@ -217,7 +234,7 @@ def get_target(self, event: Event, bot: Bot | None = None) -> Target:
     def get_message_id(self, event: Event) -> str:
         assert isinstance(
             event,
-            (InteractionCreateEvent, GuildMessageEvent, C2CMessageCreateEvent, GroupAtMessageCreateEvent),
+            (InteractionCreateEvent, GuildMessageEvent, C2CMessageCreateEvent, GroupMessageCreateEvent),
         )
         return str(event.id)
 
@@ -296,17 +313,7 @@ def _button(self, seg: Button, bot: Bot | None):
         else:
             perm = Permission(type=0, specify_user_ids=[i.target for i in seg.permission])
         label = str(seg.label)
-        style_dict = {
-            "grey": 0,
-            "secondary": 0,
-            "blue": 1,
-            "primary": 1,
-            "success": 1,
-            "info": 2,
-            "warning": 3,
-            "danger": 3,
-            "link": 4,
-        }
+
         return ButtonModel(
             id=seg.id or (label if seg.flag == "action" else None),
             render_data=RenderData(
@@ -369,8 +376,18 @@ async def send_to(self, target: Target | Event, bot: Bot, message: Message, **kw
 
         if isinstance(target, Event):
             assert isinstance(target, QQEvent)
-            if isinstance(target, (C2CMessageCreateEvent, GroupAtMessageCreateEvent)):
-                message = message.exclude("mention_channel", "mention_user", "mention_everyone", "reference")
+            if isinstance(target, (C2CMessageCreateEvent, GroupMessageCreateEvent)) and target.message_scene:
+                ref_idx = next(
+                    (
+                        ext.partition("=")[-1]
+                        for ext in target.message_scene.ext
+                        if ext.startswith("msg_idx=")
+                    ),
+                    "",
+                )
+                self.id_ref_cache[target.id] = ref_idx
+            if isinstance(target, (C2CMessageCreateEvent, GroupMessageCreateEvent)):
+                message = message.exclude("mention_channel")
             return await bot.send(event=target, message=message, **kwargs)
 
         if target.extra.get("qq.reply_seq") is not None:
@@ -390,7 +407,7 @@ async def send_to(self, target: Target | Event, bot: Bot, message: Message, **kw
                     **kwargs,  # type: ignore
                 )
             return await bot.send_to_channel(channel_id=target.id, message=message, msg_id=target.source, **kwargs)
-        message = message.exclude("mention_channel", "mention_user", "mention_everyone", "reference")
+        message = message.exclude("mention_channel")
         if target.private:
             res = await bot.send_to_c2c(
                 openid=target.id,
@@ -442,7 +459,7 @@ async def recall(self, mid: Any, bot: Bot, context: Target | Event):
                         group_openid=context.id,
                         message_id=mid.id,  # type: ignore
                     )
-            elif isinstance(context, GroupAtMessageCreateEvent):
+            elif isinstance(context, GroupMessageCreateEvent):
                 await bot.delete_group_message(
                     group_openid=context.group_openid,
                     message_id=mid.id,  # type: ignore
@@ -470,7 +487,7 @@ async def recall(self, mid: Any, bot: Bot, context: Target | Event):
                     openid=context.author.id,
                     message_id=mid,
                 )
-            elif isinstance(context, GroupAtMessageCreateEvent):
+            elif isinstance(context, GroupMessageCreateEvent):
                 await bot.delete_group_message(
                     group_openid=context.group_openid,
                     message_id=mid,
@@ -515,4 +532,10 @@ async def reaction(self, emoji: Emoji, mid: Any, bot: Bot, context: Target | Eve
     def get_reply(self, mid: Any):
         if isinstance(mid, GuildMessage):
             return Reply(mid.id)
+        if isinstance(mid, (PostGroupMessagesReturn, PostC2CMessagesReturn)):
+            ref_idx = self.id_ref_cache.get(mid.id) if mid.id else None
+            if ref_idx:
+                return Reply(ref_idx)
+        if isinstance(mid, str):
+            return Reply(self.id_ref_cache.get(mid, mid))
         raise NotImplementedError

src/nonebot_plugin_alconna/uniseg/adapters/qq/exporter.py

@@ -211,12 +211,15 @@ class FakeEvent(_fake):
         guild_id: str = "efgh"
         content: str = "test"
         author: User = User(id=field.pop("user_id", "123456789"), username=field.pop("username", "foobar"))
-        _message = field.pop("message", Message("test"))
 
         class Config:
-            extra = "forbid"
+            extra = "allow"
+    message = field.pop("message", Message("test"))
 
-    return FakeEvent(id=str(get_msg_id() + 5555), **field)
+    event = FakeEvent(id=str(get_msg_id() + 5555), **field)
+    event.message = message
+    event.original_message = message
+    return event
 
 
 def fake_satori_bot_params(self_id: str = "test", platform: str = "test") -> dict: