✨ 为TargetQQGuildChannel添加可选的guild_id字段

Author: AzideCupric

nonebot_plugin_saa/adapters/onebot_v12.py

@@ -132,7 +132,9 @@ def _extract_group_msg_event(event: Event) -> PlatformTarget:
     def _extarct_channel_msg_event(event: Event) -> PlatformTarget:
         assert isinstance(event, ChannelMessageEvent)
         if event.self.platform == "qqguild":  # all4one
-            return TargetQQGuildChannel(channel_id=int(event.channel_id))
+            return TargetQQGuildChannel(
+                channel_id=int(event.channel_id), guild_id=event.guild_id
+            )
         return TargetOB12Unknow(
             platform=event.self.platform,
             detail_type="channel",
@@ -188,7 +190,9 @@ def _extarct_channel_notice_event(event: Event) -> PlatformTarget:
             ),
         )
         if event.self.platform == "qqguild":  # all4one
-            return TargetQQGuildChannel(channel_id=int(event.channel_id))
+            return TargetQQGuildChannel(
+                channel_id=int(event.channel_id), guild_id=event.guild_id
+            )
         return TargetOB12Unknow(
             platform=event.self.platform,
             detail_type="channel",
@@ -365,7 +369,10 @@ async def list_targets(bot: BaseBot) -> list[PlatformTarget]:
                     platform = bot.platform
                     if platform == "qqguild":
                         targets.append(
-                            TargetQQGuildChannel(channel_id=int(channel["channel_id"]))
+                            TargetQQGuildChannel(
+                                channel_id=int(channel["channel_id"]),
+                                guild_id=guild["guild_id"],
+                            )
                         )
                     else:
                         targets.append(

nonebot_plugin_saa/adapters/qq.py

@@ -92,7 +92,9 @@ def extract_message_event(event: Event) -> PlatformTarget:
             )
         elif isinstance(event, (MessageCreateEvent, AtMessageCreateEvent)):
             assert event.channel_id
-            return TargetQQGuildChannel(channel_id=int(event.channel_id))
+            return TargetQQGuildChannel(
+                channel_id=int(event.channel_id), guild_id=event.guild_id
+            )
         else:
             raise ValueError(f"{type(event)} not supported")
 
@@ -240,6 +242,7 @@ async def list_targets(bot: BaseBot) -> list[PlatformTarget]:
                 targets.append(
                     TargetQQGuildChannel(
                         channel_id=int(channel.id),
+                        guild_id=guild.id,
                     )
                 )
 

nonebot_plugin_saa/auto_select_bot.py

@@ -11,13 +11,18 @@
 from nonebot import logger, get_bots
 from nonebot.compat import model_dump
 
-from .registries import BotSpecifier, PlatformTarget, TargetQQGuildDirect
 from .utils import (
     NoBotFound,
     SupportedAdapters,
     AdapterNotSupported,
     extract_adapter_type,
 )
+from .registries import (
+    BotSpecifier,
+    PlatformTarget,
+    TargetQQGuildDirect,
+    TargetQQGuildChannel,
+)
 
 BOT_CACHE: dict[Bot, set[PlatformTarget]] = {}
 BOT_CACHE_LOCK = asyncio.Lock()
@@ -123,6 +128,21 @@ def get_bot(target: PlatformTarget) -> Bot:
         raise NotImplementedError("暂不支持私聊")
 
     bots = []
+
+    if isinstance(target, TargetQQGuildChannel) and not target.guild_id:
+        logger.warning(f"{target} guild_id is empty, maybe cause mismatch")
+        for bot, targets in BOT_CACHE.items():
+            if any(
+                qct.channel_id == target.channel_id
+                for qct in targets
+                if isinstance(qct, TargetQQGuildChannel)
+            ):
+                bots.append(bot)
+        if not bots:
+            _info_current()
+            raise NoBotFound()
+        return random.choice(bots)
+
     for bot, targets in BOT_CACHE.items():
         if target in targets:
             bots.append(bot)

nonebot_plugin_saa/registries/platform_send_target.py

@@ -110,14 +110,14 @@ class TargetQQPrivateOpenId(PlatformTarget, BotSpecifier):
 
 class TargetQQGuildChannel(PlatformTarget):
     """QQ频道子频道
-
     参数
         channel_id: 子频道号
     """
 
     platform_type: Literal[SupportedPlatform.qq_guild_channel] = (
         SupportedPlatform.qq_guild_channel
     )
+    guild_id: Optional[str] = None  # 为了兼容 Kritor
     channel_id: int
 
 

tests/test_auto_select_qq_bot.py

@@ -88,7 +88,7 @@ async def test_enable(app: App, mocker: MockerFixture):
         )
         await asyncio.sleep(0.1)
 
-        target = TargetQQGuildChannel(channel_id=2233)
+        target = TargetQQGuildChannel(channel_id=2233, guild_id="1")
         assert bot is get_bot(target)
 
         target = TargetQQGroupOpenId(bot_id="3344", group_openid="GROUP")

tests/test_onebot_v12.py

@@ -573,7 +573,7 @@ def test_extract_target(app: App):
     )
 
     assert extract_target(qqguild_channel_message_event) == TargetQQGuildChannel(
-        channel_id=6677
+        channel_id=6677, guild_id="5566"
     )
 
     friend_decrease_event = FriendDecreaseEvent(
@@ -747,7 +747,9 @@ def test_extract_target(app: App):
         channel_id="7788",
         operator_id="8899",
     )
-    assert extract_target(channel_create_event) == TargetQQGuildChannel(channel_id=7788)
+    assert extract_target(channel_create_event) == TargetQQGuildChannel(
+        channel_id=7788, guild_id="6677"
+    )
 
     channel_create_event = ChannelCreateEvent(
         id="1122",
@@ -775,7 +777,9 @@ def test_extract_target(app: App):
         channel_id="7788",
         operator_id="8899",
     )
-    assert extract_target(channel_delete_event) == TargetQQGuildChannel(channel_id=7788)
+    assert extract_target(channel_delete_event) == TargetQQGuildChannel(
+        channel_id=7788, guild_id="6677"
+    )
 
     channel_delete_event = ChannelDeleteEvent(
         id="1122",
@@ -806,7 +810,7 @@ def test_extract_target(app: App):
         operator_id="8899",
     )
     assert extract_target(channel_message_delete_event) == TargetQQGuildChannel(
-        channel_id=7788
+        channel_id=7788, guild_id="5566"
     )
 
     channel_message_delete_event = ChannelMessageDeleteEvent(
@@ -839,7 +843,7 @@ def test_extract_target(app: App):
         operator_id="8899",
     )
     assert extract_target(channel_member_decrease_event) == TargetQQGuildChannel(
-        channel_id=7788
+        channel_id=7788, guild_id="5566"
     )
 
     channel_member_decrease_event = ChannelMemberDecreaseEvent(
@@ -871,7 +875,7 @@ def test_extract_target(app: App):
         operator_id="8899",
     )
     assert extract_target(channel_member_increase_event) == TargetQQGuildChannel(
-        channel_id=7788
+        channel_id=7788, guild_id="5566"
     )
 
     channel_member_increase_event = ChannelMemberIncreaseEvent(

tests/test_qq.py

@@ -469,10 +469,10 @@ async def test_extract_target(app: App):
         )
 
         assert extract_target(guild_message_event) == TargetQQGuildChannel(
-            channel_id=6677
+            channel_id=6677, guild_id="5566"
         )
         assert extract_target(guild_message_event, bot) == TargetQQGuildChannel(
-            channel_id=6677
+            channel_id=6677, guild_id="5566"
         )
 
         direct_message_event = DirectMessageCreateEvent(
@@ -537,7 +537,7 @@ async def test_target_dependency_injection(app: App):
     @matcher.handle()
     async def _(event: MessageCreateEvent, target: SaaTarget):
         assert event
-        assert target == TargetQQGuildChannel(channel_id=2233)
+        assert target == TargetQQGuildChannel(channel_id=2233, guild_id="1122")
 
     @matcher.handle()
     async def _(event: DirectMessageCreateEvent, target: SaaTarget):