fix: 保持相册广播合并发送

Author: JNHFlow21

handlers/broadcast.py

@@ -1,7 +1,8 @@
 import time
 import re
 import logging
-from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
+import html
+from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup, InputMediaPhoto, InputMediaVideo
 from telegram.ext import ContextTypes
 from telegram.constants import ParseMode
 from telegram.error import BadRequest, Forbidden
@@ -17,12 +18,26 @@
 logger = logging.getLogger("Broadcast")
 # 内存缓存：互动按钮冷却
 click_cooldown = {} 
+# 内存缓存：媒体组暂存，用于相册广播
+media_group_cache = {}  # media_group_id -> {"items": [..], "ts": float}
+msg_to_media_group = {}  # admin msg_id -> media_group_id
+MEDIA_CACHE_TTL = 300  # 秒
 
 async def handle_broadcast_input(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """终极管理员消息入口：处理广播选择、回复追踪、自动路由"""
     if update.effective_chat.id != ADMIN_ID: return
 
     msg_id = update.message.message_id
+    mgid = update.message.media_group_id
+
+    # 0. 如为相册，先缓存媒体，保持多图合并
+    if mgid:
+        media_group_cache.setdefault(mgid, {"items": [], "ts": time.time()})
+        entry = media_group_cache[mgid]
+        entry["ts"] = time.time()
+        entry["items"].append(_extract_media(update.message))
+        msg_to_media_group[msg_id] = mgid
+        _cleanup_media_cache()
 
     # 1. 检查是否是回复消息 (精准追踪)
     reply_to = update.message.reply_to_message
@@ -59,6 +74,28 @@ async def handle_broadcast_input(update: Update, context: ContextTypes.DEFAULT_T
 
     await update.message.reply_text(text, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode=ParseMode.MARKDOWN)
 
+def _extract_media(message):
+    """提取相册媒体所需信息"""
+    base = {
+        "caption": message.caption or "",
+    }
+    if message.photo:
+        fid = message.photo[-1].file_id
+        return {**base, "type": "photo", "file_id": fid}
+    if message.video:
+        return {**base, "type": "video", "file_id": message.video.file_id}
+    return None
+
+def _cleanup_media_cache():
+    now = time.time()
+    expired = [k for k, v in media_group_cache.items() if now - v["ts"] > MEDIA_CACHE_TTL]
+    for k in expired:
+        media_group_cache.pop(k, None)
+    # 同步清理 msg_to_media_group
+    for mid, mgid in list(msg_to_media_group.items()):
+        if mgid not in media_group_cache:
+            msg_to_media_group.pop(mid, None)
+
 async def execute_reply_broadcast(update: Update, context: ContextTypes.DEFAULT_TYPE, targets: dict):
     """精准回复：根据历史映射，去目标群 Reply 对应的那条消息"""
     success = 0
@@ -106,7 +143,7 @@ async def callback_broadcast_exec(update: Update, context: ContextTypes.DEFAULT_
         "signal": ("sub_signal", "topic_signal", "信号", True),
         "general": (None, None, "公共频道", False)
     }
-    
+
     conf = routes.get(action)
     if not conf:
         await query.answer("未知类型")
@@ -135,19 +172,53 @@ async def callback_broadcast_exec(update: Update, context: ContextTypes.DEFAULT_
 
     success = 0
     sent_map = {} 
+    media_group_id = msg_to_media_group.get(msg_id)
+    media_items = media_group_cache.get(media_group_id, {}).get("items") if media_group_id else None
+    is_album = media_items and len(media_items) > 0
 
     for t in targets:
         try:
-            sent = await context.bot.copy_message(
-                chat_id=t["id"],
-                from_chat_id=ADMIN_ID,
-                message_id=msg_id,
-                message_thread_id=t["topic"],
-                reply_markup=kb,
-                protect_content=True
-            )
-            success += 1
-            sent_map[str(t["id"])] = sent.message_id
+            # 相册路径：保持多媒体合并
+            if is_album:
+                media_payload = []
+                for idx, item in enumerate(media_items):
+                    if not item: 
+                        continue
+                    caption = html.escape(item["caption"]) if idx == 0 and item.get("caption") else None
+                    if item["type"] == "photo":
+                        media_payload.append(InputMediaPhoto(media=item["file_id"], caption=caption, parse_mode=ParseMode.HTML))
+                    elif item["type"] == "video":
+                        media_payload.append(InputMediaVideo(media=item["file_id"], caption=caption, parse_mode=ParseMode.HTML))
+                sent_album = await context.bot.send_media_group(
+                    chat_id=t["id"],
+                    media=media_payload,
+                    message_thread_id=t["topic"],
+                    protect_content=True
+                )
+                success += 1
+                # 记录第一条映射，便于回复追踪
+                if sent_album:
+                    sent_map[str(t["id"])] = sent_album[0].message_id
+                # 信号类型补发互动按钮
+                if kb:
+                    await context.bot.send_message(
+                        chat_id=t["id"],
+                        text="📈 信号互动",
+                        reply_markup=kb,
+                        message_thread_id=t["topic"],
+                        protect_content=True
+                    )
+            else:
+                sent = await context.bot.copy_message(
+                    chat_id=t["id"],
+                    from_chat_id=ADMIN_ID,
+                    message_id=msg_id,
+                    message_thread_id=t["topic"],
+                    reply_markup=kb,
+                    protect_content=True
+                )
+                success += 1
+                sent_map[str(t["id"])] = sent.message_id
 
         # [修复 2] 捕获具体的发送错误，清理死群
         except (BadRequest, Forbidden) as e:
@@ -221,4 +292,4 @@ async def callback_signal_btn(update: Update, context: ContextTypes.DEFAULT_TYPE
         else:
             await query.answer("✅ 已记录")
     except Exception:
-        await query.answer()
+        await query.answer()