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

{erispulse_emailadapter-4.2.0 → erispulse_emailadapter-4.3.0}/EmailAdapter/Core.py

@@ -1,5 +1,6 @@
 import asyncio
 import email
+import html as _html
 import imaplib
 import smtplib
 import ssl
@@ -25,12 +26,79 @@ try:
 except ImportError:  # pragma: no cover
     spawn_background = None
 
-__version__ = "4.2.0"
+__version__ = "4.3.0"
 
 # 软依赖的框架最低版本（运行时检测，仅提示不强制）
 MIN_FRAMEWORK_VERSION = (2, 7, 1)
 
 
+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:
+    """合并转发节点降级纯文本：每条「昵称: 正文」"""
+    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)
+
+
+def _build_forward_html(nodes, title: str = "合并聊天记录") -> str:
+    """渲染合并转发折叠 HTML 卡片（<details> 折叠 + CSS 系统色，自动适配明暗主题）"""
+    bubbles = []
+    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 "")
+        text = _forward_node_text(node).strip()
+        if not text:
+            continue
+        body = _html.escape(text).replace("\n", "<br>")
+        bubbles.append(
+            '<div style="margin:8px 0;padding:10px 12px;border:1px solid GrayText;border-radius:8px;'
+            'background:Canvas;color:CanvasText;">'
+            '<div style="font-size:12px;line-height:1.4;margin-bottom:6px;color:GrayText;">'
+            f"<strong>{_html.escape(nickname)}</strong></div>"
+            '<div style="font-size:14px;line-height:1.6;word-break:break-word;color:CanvasText;">' + body + "</div></div>"
+        )
+    if not bubbles:
+        return ""
+    return (
+        '<div style="color:CanvasText;color-scheme:light dark;">'
+        '<details style="width:100%;box-sizing:border-box;border:1px solid GrayText;border-radius:10px;'
+        'background:Canvas;color:CanvasText;overflow:hidden;">'
+        '<summary style="list-style:none;cursor:pointer;padding:10px 12px;background:Canvas;'
+        'border-bottom:1px solid GrayText;font-size:14px;font-weight:600;color:CanvasText;">'
+        f"{_html.escape(title)}</summary>"
+        '<div style="padding:8px 10px;">' + "".join(bubbles) + "</div></details></div>"
+    )
+
+
+def _wrap_email_html(body: str) -> str:
+    """包装为完整 HTML 文档（声明 charset，避免邮件客户端乱码）"""
+    return (
+        '<!DOCTYPE html><html><head><meta charset="utf-8">'
+        '<meta name="viewport" content="width=device-width, initial-scale=1">'
+        "</head><body>" + body + "</body></html>"
+    )
+
+
 @dataclass
 class EmailGlobalConfig(BaseConfig):
     """Email 适配器全局配置（适用于所有账户的默认值）"""
@@ -255,6 +323,32 @@ class EmailAdapter(BaseAdapter):
             self._html = html
             return asyncio.create_task(self._send())
 
+        def MergeForward(self, nodes, title: str = "合并聊天记录"):
+            """发送合并转发邮件（正文为折叠 HTML 卡片）
+
+            :param nodes: go-cqhttp 扩展的 OneBot v11 合并转发节点数组（或单节点 dict）
+            :param title: 折叠卡标题（未设置主题时同时作为邮件主题）
+            :return: asyncio.Task
+            """
+            if isinstance(nodes, dict):
+                nodes = [nodes]
+            return asyncio.create_task(
+                self._do_send_merge_forward(
+                    [n for n in nodes if isinstance(n, dict)], title
+                )
+            )
+
+        async def _do_send_merge_forward(self, nodes, title: str = "合并聊天记录"):
+            html = _build_forward_html(nodes, title)
+            if not html:
+                return self._adapter.make_error(
+                    retcode=10006, message="MergeForward: 节点无有效文本内容"
+                )
+            if not self._subject:
+                self._subject = title
+            self._html = _wrap_email_html(html)
+            return await self._send()
+
         def Text(self, text: str):
             """设置纯文本内容并发送邮件"""
             self._text = text
@@ -297,6 +391,7 @@ class EmailAdapter(BaseAdapter):
                 "video",
                 "file",
                 "audio",
+                "node",
             ]:
                 segments = [message]
             elif isinstance(message, list):
@@ -306,6 +401,12 @@ class EmailAdapter(BaseAdapter):
                     "Invalid message format, expected OneBot12 message segment or array"
                 )
 
+            # node 段解析：纯 node 列表自动路由合并转发邮件；混合列表降级为纯文本
+            if segments and all(
+                isinstance(seg, dict) and seg.get("type") == "node" for seg in segments
+            ):
+                return await self._do_send_merge_forward(segments)
+
             # 解析消息段
             for segment in segments:
                 seg_type = segment.get("type")
@@ -313,6 +414,8 @@ class EmailAdapter(BaseAdapter):
 
                 if seg_type == "text":
                     self._text += data.get("text", "")
+                elif seg_type == "node":
+                    self._text += _forward_nodes_plain(segment)
                 elif seg_type == "image":
                     self._add_attachment_from_segment(data, "image")
                 elif seg_type == "video":

{erispulse_emailadapter-4.2.0 → erispulse_emailadapter-4.3.0/ErisPulse_EmailAdapter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-EmailAdapter
-Version: 4.2.0
+Version: 4.3.0
 Summary: ErisPulse邮箱适配器，支持多账号管理、HTML内容和附件发送
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT

{erispulse_emailadapter-4.2.0/ErisPulse_EmailAdapter.egg-info → erispulse_emailadapter-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-EmailAdapter
-Version: 4.2.0
+Version: 4.3.0
 Summary: ErisPulse邮箱适配器，支持多账号管理、HTML内容和附件发送
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT

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

@@ -1,6 +1,6 @@
 [project]
 name = "ErisPulse-EmailAdapter"
-version = "4.2.0"
+version = "4.3.0"
 description = "ErisPulse邮箱适配器，支持多账号管理、HTML内容和附件发送"
 readme = "README.md"
 requires-python = ">=3.10"