ErisPulse-WebhookAdapter 4.2.0__tar.gz → 4.3.0__tar.gz

{erispulse_webhookadapter-4.2.0 → erispulse_webhookadapter-4.3.0}/ErisPulse_WebhookAdapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-WebhookAdapter
-Version: 4.2.0
+Version: 4.3.0
 Summary: ErisPulse的Webhook通用桥接适配模块
 Author: ErisPulse
 License: MIT

{erispulse_webhookadapter-4.2.0 → erispulse_webhookadapter-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-WebhookAdapter
-Version: 4.2.0
+Version: 4.3.0
 Summary: ErisPulse的Webhook通用桥接适配模块
 Author: ErisPulse
 License: MIT

{erispulse_webhookadapter-4.2.0 → erispulse_webhookadapter-4.3.0}/WebhookAdapter/Core.py

@@ -11,7 +11,7 @@ from ErisPulse.Core.Bases.config_schema import dict_to_dataclass
 from ErisPulse.Core.Event import register_event_mixin, unregister_platform_event_methods
 from ErisPulse.Core.i18n import i18n
 
-__version__ = "4.2.0"
+__version__ = "4.3.0"
 
 # 软依赖的框架最低版本（运行时检测，仅提示不强制）
 MIN_FRAMEWORK_VERSION = (2, 7, 1)
@@ -19,6 +19,32 @@ MIN_FRAMEWORK_VERSION = (2, 7, 1)
 from .Converter import WebhookConverter
 
 
+def _forward_node_text(node: Dict) -> str:
+    """提取合并转发节点 content 中全部 text 段文本（段间直接连接）"""
+    data = node.get("data") or {}
+    return "".join(
+        str(seg.get("data", {}).get("text") or "")
+        for seg in (data.get("content") or [])
+        if isinstance(seg, dict) and seg.get("type") == "text"
+    )
+
+
+def _forward_nodes_plain(nodes, separator: str = "\n") -> str:
+    """合并转发节点降级纯文本：每条「昵称: 正文」（Webhook 桥接无富文本能力）"""
+    lines = []
+    for node in nodes if isinstance(nodes, list) else [nodes]:
+        if not isinstance(node, dict):
+            continue
+        data = node.get("data") or {}
+        nickname = str(data.get("nickname") or "").strip()
+        text = _forward_node_text(node).strip()
+        if nickname and text:
+            lines.append(f"{nickname}: {text}")
+        elif text:
+            lines.append(text)
+    return separator.join(lines)
+
+
 @dataclass
 class WebhookAccountConfig(BotAccountConfig):
     """Webhook 桥接账户配置：一个账户 = 一个入站路径 + 一个出站 URL + 鉴权密钥"""
@@ -113,6 +139,17 @@ class WebhookAdapter(BaseAdapter):
             return self.Raw_ob12([{"type": "image", "data": {"file": file}}])
 
         def Raw_ob12(self, message: list, **kwargs):
+            if isinstance(message, dict):
+                message = [message]
+
+            # node 段降级为纯文本原文输出（内容不丢失）
+            message = [
+                {"type": "text", "data": {"text": _forward_nodes_plain(seg)}}
+                if isinstance(seg, dict) and seg.get("type") == "node"
+                else seg
+                for seg in message
+            ]
+
             async def _do_send():
                 segments = self._apply_modifiers(message)
                 ctx = self.send_context

{erispulse_webhookadapter-4.2.0 → erispulse_webhookadapter-4.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ErisPulse-WebhookAdapter"
-version = "4.2.0"
+version = "4.3.0"
 description = "ErisPulse的Webhook通用桥接适配模块"
 readme = "README.md"
 requires-python = ">=3.10"