feat: pass through qq webhook extra fields (#6274)

Author: KBVsent

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_adapter.py

@@ -75,15 +75,20 @@ async def on_c2c_message_create(self, message: botpy.message.C2CMessage) -> None
 
     def _commit(self, abm: AstrBotMessage) -> None:
         self.platform.remember_session_message_id(abm.session_id, abm.message_id)
-        self.platform.commit_event(
-            QQOfficialWebhookMessageEvent(
-                abm.message_str,
-                abm,
-                self.platform.meta(),
-                abm.session_id,
-                self,
-            ),
+        event = QQOfficialWebhookMessageEvent(
+            abm.message_str,
+            abm,
+            self.platform.meta(),
+            abm.session_id,
+            self,
         )
+        # Populate extra fields cached from the raw webhook payload
+        webhook_helper = getattr(self.platform, "webhook_helper", None)
+        if webhook_helper and abm.message_id:
+            extra_data = webhook_helper.pop_extra_data(abm.message_id)
+            for key, val in extra_data.items():
+                event.set_extra(key, val)
+        self.platform.commit_event(event)
 
 
 @register_platform_adapter("qq_official_webhook", "QQ 机器人官方 API 适配器(Webhook)")

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py

@@ -40,6 +40,10 @@ def __init__(
         self.client = botpy_client
         self.event_queue = event_queue
         self.shutdown_event = asyncio.Event()
+
+        # Cache for extra fields extracted from raw webhook payloads, keyed by message id
+        self._extra_data_cache: dict[str, dict] = {}
+
         # Deduplication cache for webhook retry callbacks.
         self._seen_event_ids: dict[str, float] = {}
         self._dedup_ttl: int = 60  # seconds
@@ -84,6 +88,10 @@ async def webhook_validation(self, validation_payload: dict):
         }
         return response
 
+    def pop_extra_data(self, message_id: str) -> dict:
+        """Pop and return extra fields cached from the raw webhook payload for a given message ID."""
+        return self._extra_data_cache.pop(message_id, {})
+
     async def callback(self):
         """内部服务器的回调入口"""
         return await self.handle_callback(quart.request)
@@ -107,7 +115,7 @@ async def handle_callback(self, request) -> dict:
         if opcode == 13:
             # validation
             signed = await self.webhook_validation(cast(dict, data))
-            print(signed)
+            logger.debug(f"webhook validation response: {signed}")
             return signed
 
         event_id = msg.get("id")
@@ -128,10 +136,24 @@ async def handle_callback(self, request) -> dict:
 
         if event and opcode == BotWebSocket.WS_DISPATCH_EVENT:
             event = msg["t"].lower()
+            # Extract extra fields from raw payload before botpy parses and discards them
+            if data:
+                msg_id = data.get("id")
+                if msg_id:
+                    author = data.get("author") or {}
+                    extra: dict = {}
+                    if union_openid := author.get("union_openid"):
+                        extra["union_openid"] = union_openid
+                    if message_scene := data.get("message_scene"):
+                        extra["message_scene"] = message_scene
+                    if extra:
+                        self._extra_data_cache[msg_id] = extra
             try:
                 func = self._connection.parser[event]
             except KeyError:
                 logger.error("_parser unknown event %s.", event)
+                if data:
+                    self._extra_data_cache.pop(data.get("id", ""), None)
             else:
                 func(msg)