feat: support attachments in manual reply (photo/video/document/voice) - Add _extract_media: extract media info from Telegram messages - Add _download_tg_file: download files from Telegram API - Modify _handle_message: accumulate attachments in awaiting_reply, send with text - Modify _handle_update: process messages without text (media-only) - Modify smtp_client.send_reply: support MIME multipart with attachments - Add comprehensive tests (11 tests, all passing)

src/tg_bot.py

@@ -292,7 +292,7 @@ def _do_ai_hint(cfg: Config, chat_id: int, conv: dict, ctx: dict, hint: str):
 def _handle_update(tg_cfg: TelegramConfig, cfg: Config, update: dict):
     if "callback_query" in update:
         _handle_callback(tg_cfg, cfg, update["callback_query"])
-    elif "message" in update and "text" in update["message"]:
+    elif "message" in update:
         _handle_message(tg_cfg, cfg, update["message"])
 
 
@@ -453,7 +453,7 @@ def _handle_callback(tg_cfg: TelegramConfig, cfg: Config, cb: dict):
 
 def _handle_message(tg_cfg: TelegramConfig, cfg: Config, msg: dict):
     chat_id = msg["chat"]["id"]
-    text = msg["text"].strip()
+    text = msg.get("text", "").strip()
     conv = load_conversation(chat_id)
 
     if not conv:
@@ -463,8 +463,9 @@ def _handle_message(tg_cfg: TelegramConfig, cfg: Config, msg: dict):
     chat_id_str = str(chat_id)
     prompt_msg_id = conv.get("prompt_msg_id")
     state = conv.get("state")
+    media = _extract_media(msg)
 
-    logger.info("TG 消息: state=%s text=%s", state, text[:60])
+    logger.info("TG 消息: state=%s text=%s media=%d", state, text[:60] if text else "(无)", len(media))
 
     if state == "awaiting_reply":
         ctx = load_email_context(conv["summary_msg_id"])
@@ -476,11 +477,32 @@ def _handle_message(tg_cfg: TelegramConfig, cfg: Config, msg: dict):
             logger.info("  上下文已丢失，清理")
             return
 
+        # 有附件但没文字：累积附件，等用户输入文字
+        if media and not text:
+            pending = conv.get("pending_attachments", [])
+            for att in media:
+                pending.append(att)
+            conv["pending_attachments"] = pending
+            save_conversation(chat_id, conv)
+            delete_message(tg_cfg, chat_id_str, user_msg_id)
+            send_text(tg_cfg, chat_id_str,
+                      f"📎 已添加 {len(pending)} 个附件，请输入回复内容发送",
+                      reply_markup=_cancel_keyboard())
+            return
+
+        # 有文字（可能也有附件）：发送邮件
         delete_message(tg_cfg, chat_id_str, user_msg_id)
         if prompt_msg_id:
             delete_message(tg_cfg, chat_id_str, prompt_msg_id)
-        _do_send_reply(tg_cfg, cfg, chat_id, conv["summary_msg_id"], ctx, text)
-        send_text(tg_cfg, chat_id_str, f"✅ 回复已发送: {text}")
+
+        # 合并累积的附件
+        all_attachments = conv.get("pending_attachments", [])
+        all_attachments.extend(media)
+
+        _do_send_reply(tg_cfg, cfg, chat_id, conv["summary_msg_id"], ctx, text,
+                       attachments=all_attachments or None)
+        attach_info = f" (+{len(all_attachments)}个附件)" if all_attachments else ""
+        send_text(tg_cfg, chat_id_str, f"✅ 回复已发送: {text}{attach_info}")
         delete_conversation(chat_id)
         logger.info("  回复发送完成")
 
@@ -518,8 +540,76 @@ def _show_ai_suggestions(tg_cfg: TelegramConfig, chat_id: int, msg_id: int,
     })
 
 
+def _download_tg_file(tg_cfg: TelegramConfig, file_id: str, filename: str) -> str:
+    """从 Telegram 下载文件到本地 media/ 目录，返回本地路径"""
+    import os
+    from pathlib import Path
+    media_dir = Path("media")
+    media_dir.mkdir(exist_ok=True)
+    resp = requests.get(
+        f"https://api.telegram.org/bot{tg_cfg.bot_token}/getFile",
+        params={"file_id": file_id}, timeout=30,
+    )
+    resp.raise_for_status()
+    file_path = resp.json()["result"]["file_path"]
+    dl = requests.get(
+        f"https://api.telegram.org/file/bot{tg_cfg.bot_token}/{file_path}",
+        timeout=60,
+    )
+    dl.raise_for_status()
+    dest = media_dir / filename
+    dest.write_bytes(dl.content)
+    logger.info("  下载附件: %s (%d bytes)", filename, len(dl.content))
+    return str(dest)
+
+
+def _extract_media(msg: dict) -> list[dict]:
+    """从 Telegram 消息中提取附件信息列表 [{file_id, filename, mime_type}]"""
+    attachments = []
+    # 照片取最大尺寸
+    if "photo" in msg:
+        photo = max(msg["photo"], key=lambda p: p.get("file_size", 0))
+        ext = ".jpg"
+        attachments.append({
+            "file_id": photo["file_id"],
+            "filename": f"photo_{photo['file_id'][:8]}{ext}",
+            "mime_type": "image/jpeg",
+        })
+    if "video" in msg:
+        v = msg["video"]
+        attachments.append({
+            "file_id": v["file_id"],
+            "filename": v.get("file_name", f"video_{v['file_id'][:8]}.mp4"),
+            "mime_type": v.get("mime_type", "video/mp4"),
+        })
+    if "document" in msg:
+        d = msg["document"]
+        attachments.append({
+            "file_id": d["file_id"],
+            "filename": d.get("file_name", f"doc_{d['file_id'][:8]}"),
+            "mime_type": d.get("mime_type", "application/octet-stream"),
+        })
+    if "voice" in msg:
+        vc = msg["voice"]
+        attachments.append({
+            "file_id": vc["file_id"],
+            "filename": f"voice_{vc['file_id'][:8]}.ogg",
+            "mime_type": vc.get("mime_type", "audio/ogg"),
+        })
+    if "sticker" in msg:
+        s = msg["sticker"]
+        if not s.get("is_animated"):
+            attachments.append({
+                "file_id": s["file_id"],
+                "filename": f"sticker_{s['file_id'][:8]}.webp",
+                "mime_type": "image/webp",
+            })
+    return attachments
+
+
 def _do_send_reply(tg_cfg: TelegramConfig, cfg: Config,
-                   chat_id: int, msg_id: int, ctx: dict, reply_text: str):
+                   chat_id: int, msg_id: int, ctx: dict, reply_text: str,
+                   attachments: list[dict] | None = None):
     acct = cfg.email_accounts[ctx["account_idx"]]
     if not acct.smtp:
         send_text(tg_cfg, str(chat_id), "❌ 该邮箱未配置 SMTP，无法发送回复。")
@@ -532,4 +622,15 @@ def _do_send_reply(tg_cfg: TelegramConfig, cfg: Config,
     if not to_addr:
         to_addr = ctx["sender"]
     subject = ctx["subject"]
-    send_reply(acct, to_addr, subject, reply_text)
+
+    # 下载 Telegram 附件到本地
+    local_files = []
+    if attachments:
+        for att in attachments:
+            try:
+                path = _download_tg_file(tg_cfg, att["file_id"], att["filename"])
+                local_files.append((path, att["mime_type"]))
+            except Exception as e:
+                logger.error("  附件下载失败: %s - %s", att["filename"], e)
+
+    send_reply(acct, to_addr, subject, reply_text, attachments=local_files or None)