Update app.py

app.py

@@ -11,12 +11,11 @@ import queue
 from collections import defaultdict
 from datetime import datetime, timezone, timedelta
 from threading import Thread, Lock, Timer
-from urllib.parse import parse_qs, unquote, quote
+from urllib.parse import parse_qs, unquote
 from functools import wraps
 
 import urllib3.util.connection as urllib3_cn
 
-# 🌟 强制 IPv4
 def allowed_gai_family():
     return socket.AF_INET
 urllib3_cn.allowed_gai_family = allowed_gai_family
@@ -36,6 +35,46 @@ try:
 except ImportError:
     print("⚠️ 未安装 pypinyin")
 
+# ===== 🔧 Fix 2: 更宽泛的标签正则 & 辅助函数 =====
+TAG_PATTERN = r'#[^\s#,，。！!?？;；:：<>()（）【】《》\[\]]+'
+
+def extract_tags(text):
+    """提取标签，支持 emoji、& 等特殊字符"""
+    raw = re.findall(TAG_PATTERN, text)
+    return [t.rstrip('.,;:!?。，；：！？…)）】》') for t in raw if len(t) > 1]
+
+def classify_tag_key(tag):
+    """把标签按首字符分类到目录分组 key"""
+    clean_str = tag[1:]
+    if not clean_str:
+        return None
+    fc = clean_str[0]
+    if fc.isdigit():
+        return "0-9"
+    elif fc.isalpha() and fc.isascii():
+        return fc.upper()
+    elif '\u4e00' <= fc <= '\u9fff':
+        try:
+            py = lazy_pinyin(fc)
+            if py and len(py[0]) > 0:
+                return py[0][0].upper()
+        except NameError:
+            return "中文"
+        return "中文"
+    else:
+        return "#"
+
+# 🔧 Fix 1: 目录任务向后兼容迁移
+def migrate_dir_task(task):
+    """把旧格式 dir_task 迁移到新的 scan_channel + targets 结构"""
+    if "scan_channel" not in task:
+        task["scan_channel"] = task.get("channel_id", "")
+    if "targets" not in task:
+        task["targets"] = [{"channel_id": task.get("channel_id", ""), "msg_id": str(task.get("msg_id", ""))}]
+    if isinstance(task.get("last_html_dir"), str):
+        task["last_html_dir"] = {}
+    return task
+
 # ===== 2. WebDAV 存储配置 =====
 DAV_URL_BASE = os.environ.get("WEBDAV_URL", "").rstrip("/")
 DAV_USER = os.environ.get("WEBDAV_USER") or os.environ.get("WEBDAV_USERNAME")
@@ -47,7 +86,6 @@ REMOTE_FILENAME = "tg_bot_data_v5.json"
 DATA = {"users": {}, "msg_map": {}, "backup_log": {}}
 data_lock = Lock()
 
-# 👇 增加内存级网页源码缓存字典
 HTML_CACHE = {}
 
 TL_LOOP = None
@@ -92,7 +130,6 @@ apihelper.API_URL = "https://nine7.linlizhi0210.workers.dev/bot{0}/{1}"
 user_states = {}
 ALL_TYPES = ['text', 'audio', 'document', 'photo', 'sticker', 'video', 'video_note', 'voice', 'location', 'contact', 'animation', 'dice', 'poll']
 
-# ====== 频率限制 ======
 _rate_limit = defaultdict(list)
 RATE_LIMIT_MAX = 30
 RATE_LIMIT_WINDOW = 60
@@ -105,18 +142,13 @@ def check_rate_limit(uid):
     _rate_limit[uid].append(now)
     return False
 
-# ====== SSE 实时推送队列 ======
 _event_queues = defaultdict(lambda: queue.Queue(maxsize=50))
 
 def push_event(uid, event_type, data):
     q = _event_queues.get(uid)
     if q:
         try:
-            q.put_nowait({
-                "type": event_type,
-                "data": data,
-                "time": time.strftime("%H:%M:%S")
-            })
+            q.put_nowait({"type": event_type, "data": data, "time": time.strftime("%H:%M:%S")})
         except queue.Full:
             pass
 
@@ -236,29 +268,32 @@ def cmd_build_dir(message):
     user_states[uid] = {"step": "WAIT_MANUAL_DIR_CH"}
     send_channel_prompt(uid, "🗂️ **生成频道标签目录**\n\n请输入需要扫描的【频道 ID】(例如 `-10012345678`):")
 
+# 🔧 Fix 1: 目录任务创建 - 开启新流程
 @bot.message_handler(commands=['add_dir'])
 def cmd_add_dir(message):
     uid = str(message.from_user.id)
     user_states[uid] = {"step": "WAIT_DIR_NAME"}
     bot.send_message(uid, "🗂️ **创建自动更新目录任务**\n\n1️⃣ 请给任务起个名字 (如: `主频道自动目录`):", parse_mode="Markdown")
 
+# 🔧 Fix 1: 目录任务列表 - 显示新结构
 @bot.message_handler(commands=['list_dir'])
 def cmd_list_dir(message):
     uid = str(message.from_user.id)
     dirs = DATA["users"].get(uid, {}).get("dir_tasks", [])
     if not dirs: return bot.send_message(uid, "暂无自动目录任务。")
     for i, t in enumerate(dirs):
+        migrate_dir_task(t)
+        targets_text = "\n".join([f"  ▪️ `{tgt['channel_id']}` 消息 `{tgt['msg_id']}`" for tgt in t.get("targets", [])])
         msg = (f"🗂️ **任务**: `{t.get('task_name', '未命名')}`\n"
-               f"🔍 **扫描源**: `{t.get('scan_channel_id', t.get('channel_id'))}`\n"
-               f"📌 **写入目标**: `{t.get('channel_id')}` | **承载消息**: `{t.get('msg_id')}`\n"
+               f"🔍 **扫描频道**: `{t.get('scan_channel')}`\n"
+               f"📌 **更新目标**:\n{targets_text}\n"
                f"⏱ **频率**: 每 `{t.get('interval', 15)}` 分钟扫描一次\n"
                f"🛡️ **屏蔽标签**: `{', '.join(t.get('blacklist', [])) or '无'}`\n"
                f"📦 **已收录标签**: `{len(t.get('tags_cache', []))} 个`")
         markup = types.InlineKeyboardMarkup(row_width=2)
-        markup.add(types.InlineKeyboardButton("✏️ 扫描源频道", callback_data=f"ed_scid_{i}"), types.InlineKeyboardButton("✏️ 目标频道", callback_data=f"ed_chid_{i}"))
-        markup.add(types.InlineKeyboardButton("✏️ 承载消息 ID", callback_data=f"ed_msgid_{i}"))
         markup.add(types.InlineKeyboardButton("➕ 加屏蔽", callback_data=f"ed_ab_{i}"), types.InlineKeyboardButton("➖ 删屏蔽", callback_data=f"ed_rb_{i}"))
         markup.add(types.InlineKeyboardButton("⏱ 扫描频率", callback_data=f"ed_in_{i}"))
+        markup.add(types.InlineKeyboardButton("➕ 添加目标", callback_data=f"ed_at_{i}"), types.InlineKeyboardButton("➖ 删除目标", callback_data=f"ed_rt_{i}"))
         markup.add(types.InlineKeyboardButton("🗑️ 终止并删除该目录任务", callback_data=f"d_d_{i}"))
         bot.send_message(uid, msg, reply_markup=markup, parse_mode="Markdown")
 
@@ -381,12 +416,10 @@ def process_user_text(uid, text):
             if not text.isdigit(): return bot.send_message(uid, "❌ 只能输入纯数字！")
             user_states[uid].update({"step": "WAIT_STAT_BLACKLIST", "duration": int(text)})
             bot.send_message(uid, "9️⃣ 请输入**屏蔽名单** (用空格隔开)\n💡 不需要屏蔽请回复 `无`:")
-        
         elif step == "WAIT_STAT_BLACKLIST":
             blacklist = [] if text.strip() == "无" else [x.strip() for x in re.split(r'[\s\n]+', text) if x.strip()]
             user_states[uid].update({"step": "WAIT_STAT_BL_TITLE", "stats_blacklist": blacklist})
             bot.send_message(uid, "🔟 请输入**屏蔽区的标题** (例如 `🚫本月轮换限制：`)\n💡 不需要请回复 `无`:")
-        
         elif step == "WAIT_STAT_BL_TITLE":
             bl_title = "" if text.strip() == "无" else text.strip()
             if "stats_tasks" not in DATA["users"][uid]: DATA["users"][uid]["stats_tasks"] = []
@@ -395,8 +428,7 @@ def process_user_text(uid, text):
                 "table_title": state["table_title"], "top_n": state["top_n"], "trigger_tag": state["trigger_tag"],
                 "interval": state["interval"], "duration": state["duration"], "start_time": int(time.time()),
                 "last_run": 0, "completed_items": [], "last_checked_msg_id": int(state["msg_id"]),
-                "stats_blacklist": state["stats_blacklist"],
-                "blacklist_title": bl_title
+                "stats_blacklist": state["stats_blacklist"], "blacklist_title": bl_title
             })
             save_data()
             bot.send_message(uid, "✅ 完美！任务已创建。")
@@ -431,15 +463,13 @@ def process_user_text(uid, text):
                     task["stats_blacklist"] = [x for x in task.get("stats_blacklist", []) if x not in to_remove]
                 elif step == "EDIT_STAT_BLTITLE":
                     task["blacklist_title"] = "" if text.strip() == "无" else text.strip()
-                
                 task["last_html_stats"] = ""
                 task["last_run"] = 0
-                
                 save_data()
                 bot.send_message(uid, "✅ 属性已修改！下次刷新周期将立即更新。")
             except Exception as e: bot.send_message(uid, f"❌ 修改失败: {e}")
             user_states.pop(uid)
-            
+
         elif step == "WAIT_BACKUP_SRC":
             user_states[uid] = {"step": "WAIT_BACKUP_TGT", "src": text}
             send_channel_prompt(uid, "📌 请输入【目标频道 ID】:")
@@ -464,64 +494,68 @@ def process_user_text(uid, text):
             bot.send_message(uid, "🔍 正在扫描频道历史标签，请耐心等待...")
             Thread(target=generate_smart_directory, args=(uid, text)).start()
             user_states.pop(uid)
-            
-        # ====== 🌟 私聊创建自动更新目录的链式会话 🌟 ======
+
+        # 🔧 Fix 1: 目录任务新建流程 - 分离扫描频道与目标频道
         elif step == "WAIT_DIR_NAME":
             user_states[uid].update({"step": "WAIT_DIR_SCAN_CH", "task_name": text})
-            send_channel_prompt(uid, "2️⃣ 请输入【需要扫描提取标签的源频道 ID】:")
+            send_channel_prompt(uid, "2️⃣ 请输入要**扫描标签的频道 ID**:")
         elif step == "WAIT_DIR_SCAN_CH":
-            user_states[uid].update({"step": "WAIT_DIR_CH", "scan_channel_id": text})
-            send_channel_prompt(uid, "3️⃣ 请输入【承载并渲染目录的目标频道 ID】:")
-        elif step == "WAIT_DIR_CH":
-            user_states[uid].update({"step": "WAIT_DIR_MSG", "ch_id": text})
-            bot.send_message(uid, "4️⃣ 请输入目标频道中承载目录的【消息 ID】:")
-        elif step == "WAIT_DIR_MSG":
+            user_states[uid].update({"step": "WAIT_DIR_TGT_CH", "scan_channel": text, "targets": []})
+            send_channel_prompt(uid, "3️⃣ 请输入第一个**目标频道 ID** (目录将更新到此频道的消息中):")
+        elif step == "WAIT_DIR_TGT_CH":
+            user_states[uid].update({"step": "WAIT_DIR_TGT_MSG", "current_tgt_ch": text})
+            bot.send_message(uid, f"📌 请输入频道 `{text}` 中**承载目录的消息 ID**:")
+        elif step == "WAIT_DIR_TGT_MSG":
             if text.startswith('http'): text = text.split('/')[-1]
-            user_states[uid].update({"step": "WAIT_DIR_BLACKLIST", "msg_id": text})
-            bot.send_message(uid, "5️⃣ 请输入需要**屏蔽的标签** (空格隔开，不屏蔽回复 `无`):")
+            state["targets"].append({"channel_id": state["current_tgt_ch"], "msg_id": text})
+            user_states[uid]["step"] = "WAIT_DIR_MORE_OR_BL"
+            send_channel_prompt(uid, f"✅ 已添加目标 {len(state['targets'])}！\n\n📌 发送频道 ID 继续添加目标，或回复 **完成** 进入下一步:")
+        elif step == "WAIT_DIR_MORE_OR_BL":
+            if text.strip() in ["完成", "done", "Done", "完"]:
+                user_states[uid]["step"] = "WAIT_DIR_BLACKLIST"
+                bot.send_message(uid, "4️⃣ 请输入需要**屏蔽的标签** (空格隔开，不屏蔽回复 `无`):")
+            else:
+                user_states[uid].update({"step": "WAIT_DIR_TGT_MSG", "current_tgt_ch": text})
+                bot.send_message(uid, f"📌 请输入频道 `{text}` 中**承载目录的消息 ID**:")
         elif step == "WAIT_DIR_BLACKLIST":
             blacklist = [] if text.strip() == "无" else text.split()
             if "dir_tasks" not in DATA["users"][uid]: DATA["users"][uid]["dir_tasks"] = []
             DATA["users"][uid]["dir_tasks"].append({
-                "task_name": state["task_name"], 
-                "scan_channel_id": state["scan_channel_id"],
-                "channel_id": state["ch_id"],
-                "msg_id": state["msg_id"], 
-                "blacklist": blacklist, 
-                "interval": 15,
-                "tags_cache": [], "tags_map": {}, "scanned_msgs": {}, "last_html_dir": ""
+                "task_name": state["task_name"],
+                "scan_channel": state["scan_channel"],
+                "targets": state["targets"],
+                "blacklist": blacklist, "interval": 15,
+                "tags_cache": [], "tags_map": {}, "scanned_msgs": {}, "last_html_dir": {}
             })
             save_data()
-            bot.send_message(uid, "✅ 目录任务建立完成！")
+            bot.send_message(uid, f"✅ 目录任务建立完成！共 {len(state['targets'])} 个更新目标。")
             user_states.pop(uid)
 
+        # 🔧 Fix 1: 编辑目录任务 - 添加目标中间步骤
         elif step.startswith("EDIT_DIR_"):
             idx = state["idx"]
             try:
                 task = DATA["users"][uid]["dir_tasks"][idx]
-                if step == "EDIT_DIR_SCAN_CH":
-                    task["scan_channel_id"] = text
-                elif step == "EDIT_DIR_CH":
-                    task["channel_id"] = text
-                elif step == "EDIT_DIR_MSGID":
+                migrate_dir_task(task)
+                if step == "EDIT_DIR_ADD_TGT_CH":
+                    user_states[uid].update({"step": "EDIT_DIR_ADD_TGT_MSG", "add_tgt_ch": text})
+                    return bot.send_message(uid, "📌 请输入该频道的**消息 ID**:")
+                elif step == "EDIT_DIR_ADD_TGT_MSG":
                     if text.startswith('http'): text = text.split('/')[-1]
-                    task["msg_id"] = text
+                    task.setdefault("targets", []).append({"channel_id": state["add_tgt_ch"], "msg_id": text})
+                    bot.send_message(uid, "✅ 新目标已添加！")
                 elif step == "EDIT_DIR_ADDBL":
                     task["blacklist"].extend(text.split())
                     task["blacklist"] = list(set(task["blacklist"]))
+                    bot.send_message(uid, "✅ 目录属性已修改！")
                 elif step == "EDIT_DIR_RMBL":
                     to_rem = text.split()
                     task["blacklist"] = [t for t in task["blacklist"] if t not in to_rem]
+                    bot.send_message(uid, "✅ 目录属性已修改！")
                 elif step == "EDIT_DIR_INTV":
                     task["interval"] = int(text)
-                
-                # 重置缓存强制重扫
-                task["tags_map"] = {}
-                task["scanned_msgs"] = {}
-                task["last_html_dir"] = ""
-                
+                    bot.send_message(uid, "✅ 目录属性已修改！")
                 save_data()
-                bot.send_message(uid, "✅ 目录属性已修改！")
             except Exception as e: bot.send_message(uid, f"❌ 修改失败: {e}")
             user_states.pop(uid)
 
@@ -588,6 +622,24 @@ def handle_callbacks(call):
             bot.edit_message_text("✅ 频道已移除。", call.message.chat.id, call.message.message_id)
         return bot.answer_callback_query(call.id)
     elif data.startswith("selch_") or data.startswith("bkp_"): return
+
+    # 🔧 Fix 1: 处理删除目标 edrt_{task_idx}_{target_idx}
+    if data.startswith("edrt_"):
+        parts = data.split("_")
+        task_idx = int(parts[1])
+        tgt_idx = int(parts[2])
+        try:
+            task = DATA["users"][uid]["dir_tasks"][task_idx]
+            migrate_dir_task(task)
+            targets = task.get("targets", [])
+            if tgt_idx < len(targets):
+                removed = targets.pop(tgt_idx)
+                save_data()
+                bot.edit_message_text(f"✅ 目标已删除: {removed['channel_id']} | 消息 {removed['msg_id']}", call.message.chat.id, call.message.message_id)
+        except Exception as e:
+            bot.send_message(uid, f"❌ 删除失败: {e}")
+        return bot.answer_callback_query(call.id)
+
     try:
         action, idx_str = data.rsplit("_", 1)
         idx = int(idx_str)
@@ -604,7 +656,27 @@ def handle_callbacks(call):
         del DATA["users"][uid]["dir_tasks"][idx]
         bot.edit_message_text("❌ 目录任务已移除", call.message.chat.id, call.message.message_id)
         save_data()
-    elif action in ["e_name", "e_titl", "e_trig", "e_topn", "e_intv", "e_dura", "e_chid", "e_msgid", "e_sabl", "e_srbl", "e_sblt", "ed_ab", "ed_rb", "ed_in", "ed_scid", "ed_chid", "ed_msgid"]:
+    # 🔧 Fix 1: 添加/删除目标回调
+    elif action == "ed_at":
+        user_states[uid] = {"step": "EDIT_DIR_ADD_TGT_CH", "idx": idx}
+        send_channel_prompt(uid, "📌 请输入新目标的**频道 ID**:")
+        bot.answer_callback_query(call.id, "请输入新目标频道")
+    elif action == "ed_rt":
+        task = DATA["users"][uid]["dir_tasks"][idx]
+        migrate_dir_task(task)
+        targets = task.get("targets", [])
+        if not targets:
+            bot.send_message(uid, "暂无目标可删除。")
+        else:
+            markup_del = types.InlineKeyboardMarkup(row_width=1)
+            for ti, tgt in enumerate(targets):
+                markup_del.add(types.InlineKeyboardButton(
+                    f"❌ {tgt['channel_id']} | 消息 {tgt['msg_id']}",
+                    callback_data=f"edrt_{idx}_{ti}"
+                ))
+            bot.send_message(uid, "🗑️ 选择要删除的目标:", reply_markup=markup_del)
+        bot.answer_callback_query(call.id)
+    elif action in ["e_name", "e_titl", "e_trig", "e_topn", "e_intv", "e_dura", "e_chid", "e_msgid", "e_sabl", "e_srbl", "e_sblt", "ed_ab", "ed_rb", "ed_in"]:
         prompt_map = {
             "e_name": "📌 请输入新的任务名称:",
             "e_titl": "📌 请输入新的表头标题:",
@@ -617,34 +689,26 @@ def handle_callbacks(call):
             "e_sabl": "🚫 请输入要**屏蔽的名字** (空格隔开):",
             "e_srbl": "✅ 请输入要**解除屏蔽的名字** (空格隔开):",
             "e_sblt": "📝 请输入**屏蔽区的显示标题**\n(例如 `🚫本月轮换限制：`，回复 `无` 则不显示):",
-            "ed_scid": "📌 请输入新的【扫描源频道 ID】:",
-            "ed_chid": "📌 请输入新的【承载消息目标频道 ID】:",
-            "ed_msgid": "📌 请输入新的【承载目录消息 ID】:",
             "ed_ab": "📌 请输入要追加的屏蔽标签(空格隔开):",
             "ed_rb": "📌 请输入要移出屏蔽的标签(空格隔开):",
             "ed_in": "📌 请输入新的扫描频率(分钟):"
         }
         state_map = {
-            "e_name": "EDIT_STAT_NAME",
-            "e_titl": "EDIT_STAT_TITL",
-            "e_trig": "EDIT_STAT_TRIG",
-            "e_topn": "EDIT_STAT_TOPN",
-            "e_intv": "EDIT_STAT_INTV",
-            "e_dura": "EDIT_STAT_DURA",
-            "e_chid": "EDIT_STAT_CHID",
-            "e_msgid": "EDIT_STAT_MSGID",
-            "e_sabl": "EDIT_STAT_ADDBL",
-            "e_srbl": "EDIT_STAT_RMBL",
+            "e_name": "EDIT_STAT_NAME", "e_titl": "EDIT_STAT_TITL",
+            "e_trig": "EDIT_STAT_TRIG", "e_topn": "EDIT_STAT_TOPN",
+            "e_intv": "EDIT_STAT_INTV", "e_dura": "EDIT_STAT_DURA",
+            "e_chid": "EDIT_STAT_CHID", "e_msgid": "EDIT_STAT_MSGID",
+            "e_sabl": "EDIT_STAT_ADDBL", "e_srbl": "EDIT_STAT_RMBL",
             "e_sblt": "EDIT_STAT_BLTITLE",
-            "ed_scid": "EDIT_DIR_SCAN_CH",
-            "ed_chid": "EDIT_DIR_CH",
-            "ed_msgid": "EDIT_DIR_MSGID",
-            "ed_ab": "EDIT_DIR_ADDBL",
-            "ed_rb": "EDIT_DIR_RMBL",
+            "ed_ab": "EDIT_DIR_ADDBL", "ed_rb": "EDIT_DIR_RMBL",
             "ed_in": "EDIT_DIR_INTV"
         }
         user_states[uid] = {"step": state_map[action], "idx": idx}
-        bot.send_message(uid, prompt_map[action])
+        # 🔧 Fix 3: 修改频道ID时也弹出地址簿快选
+        if action in ["e_chid"]:
+            send_channel_prompt(uid, prompt_map[action])
+        else:
+            bot.send_message(uid, prompt_map[action])
         bot.answer_callback_query(call.id, "请在对话框输入新值")
 
 def run_smart_backup_v2(latest_id, uid, src, tgt):
@@ -659,8 +723,7 @@ def run_smart_backup_v2(latest_id, uid, src, tgt):
         ref_msg = await TL_CLIENT.get_messages(int(src), ids=latest_id)
         target_grouped_id = ref_msg.grouped_id if ref_msg else None
         async for msg in TL_CLIENT.iter_messages(int(src)):
-            if msg.action is not None:
-                continue
+            if msg.action is not None: continue
             if msg.id > latest_id:
                 if target_grouped_id and msg.grouped_id == target_grouped_id: messages.append(msg)
                 continue
@@ -701,25 +764,20 @@ def run_smart_backup_v2(latest_id, uid, src, tgt):
                 if e.error_code == 429:
                     time.sleep(e.result_json.get('parameters', {}).get('retry_after', 10))
                 else:
-                    failed += len(msg_ids_to_copy)
-                    failed_ids.extend(msg_ids_to_copy)
-                    break
+                    failed += len(msg_ids_to_copy); failed_ids.extend(msg_ids_to_copy); break
             except Exception:
-                failed += len(msg_ids_to_copy)
-                failed_ids.extend(msg_ids_to_copy)
-                break
+                failed += len(msg_ids_to_copy); failed_ids.extend(msg_ids_to_copy); break
     save_data()
-    
     report = f"🏁 **备份完成！**\n源: `{src}` ➡️ 目: `{tgt}`\n✅ 新增 **{success}** 条"
     if failed > 0:
         report += f"\n❌ 失败 **{failed}** 条"
         show_ids = failed_ids[:10]
         report += f"\n失败消息 ID: `{show_ids}`"
-        if len(failed_ids) > 10:
-            report += f"\n... 等共 {len(failed_ids)} 条"
+        if len(failed_ids) > 10: report += f"\n... 等共 {len(failed_ids)} 条"
     bot.send_message(uid, report)
     push_event(uid, "backup_done", f"✅ 备份完成，新增 {success} 条，失败 {failed} 条")
 
+# 🔧 Fix 2: 使用 extract_tags + classify_tag_key
 def generate_smart_directory(uid, ch_id):
     global TL_LOOP, TL_CLIENT
     if not TL_LOOP or not TL_CLIENT: return bot.send_message(uid, "❌ 错误: Userbot 未启动。")
@@ -732,23 +790,14 @@ def generate_smart_directory(uid, ch_id):
                     else:
                         html_text = tl_html.unparse(msg.raw_text, msg.entities)
                         clean_text = html.unescape(re.sub(r'<.*?>', '', re.sub(r'<blockquote.*?>.*?</blockquote>', '', html_text, flags=re.DOTALL)))
-                    for t in re.findall(r'#[A-Za-z0-9_\u4e00-\u9fa5\s&+\-/Detail\u200d\u2600-\u27bf\U0001f000-\U0001f9ff]+', clean_text): 
-                        tags_set.add(t.strip())
+                    for t in extract_tags(clean_text):
+                        tags_set.add(t)
         except Exception as e: return None, str(e)
         if not tags_set: return None, "没有找到有效标签。"
         directory_map = {}
         for tag in tags_set:
-            clean_str = tag[1:]
-            if not clean_str: continue
-            fc = clean_str[0]
-            key = "#"
-            if fc.isalpha() and fc.isascii(): key = fc.upper()
-            elif fc.isdigit(): key = "0-9"
-            elif '\u4e00' <= fc <= '\u9fff':
-                try:
-                    py = lazy_pinyin(fc)
-                    if py and len(py[0])>0: key = py[0][0].upper()
-                except NameError: key = "中文"
+            key = classify_tag_key(tag)
+            if key is None: continue
             if key not in directory_map: directory_map[key] = []
             directory_map[key].append(tag)
         return directory_map, None
@@ -762,19 +811,9 @@ def generate_smart_directory(uid, ch_id):
     lines = ["目录：\n<blockquote expandable>"]
     keys = sorted(directory_map.keys())
     if "0-9" in keys: keys.remove("0-9"); keys.insert(0, "0-9")
-    
-    c_chat_str = str(ch_id).replace("-100", "")
-    
     for key in keys:
-        linked_tags = []
-        for t in sorted(directory_map[key]):
-            safe_search_text = quote(t)
-            tg_search_link = f"tg://resolve?domain=c/{c_chat_str}&query={safe_search_text}"
-            linked_tags.append(f'<a href="{tg_search_link}">{html.escape(t)}</a>')
-        
-        tags_line = "  ".join(linked_tags)
-        lines.append(f"<b>{key}</b>: {tags_line}\n")
-    
+        tags_line = " ".join([html.escape(t) for t in sorted(directory_map[key])])
+        lines.append(f"{key}: {tags_line}\n")
     lines.append("</blockquote>")
     final_text = "\n".join(lines)
     if len(final_text) > 4000:
@@ -902,11 +941,9 @@ def start_telethon_worker():
                 trigger_tag = task.get('trigger_tag', '#未设置')
                 completed_items = []
                 interval_sec = int(task.get('interval', 60)) * 60
-                
                 if current_time > int(task.get('start_time', current_time)) + int(task.get('duration', 7)) * 86400:
                     del tasks[i]; data_changed = True; continue
                 if current_time - int(task.get('last_run', 0)) < interval_sec: continue
-                
                 try:
                     original_msg = await TL_CLIENT.get_messages(ch_id, ids=msg_id)
                     if not original_msg: continue
@@ -914,17 +951,14 @@ def start_telethon_worker():
                         raw_html = tl_html.unparse(original_msg.raw_text, original_msg.entities)
                         base_html = raw_html.split("➖➖➖➖➖➖")[0].rstrip() if "➖➖➖➖➖➖" in raw_html else raw_html.rstrip()
                     else: base_html = ""
-                    
                     comments_data_list = []
                     discussion_chat_id = None
                     thread_id = None
-                    
                     async for comment in TL_CLIENT.iter_messages(ch_id, reply_to=msg_id):
                         if not discussion_chat_id:
                             discussion_chat_id = comment.chat_id
                             if comment.reply_to:
                                 thread_id = comment.reply_to.reply_to_top_id or comment.reply_to.reply_to_msg_id
-                                
                         if comment.reactions:
                             total_reacts = sum(r.count for r in comment.reactions.results)
                             if total_reacts > 0:
@@ -932,38 +966,27 @@ def start_telethon_worker():
                                 short_text = full_raw_text
                                 if len(short_text) > 15: short_text = short_text[:14] + "…"
                                 comments_data_list.append((total_reacts, html.escape(short_text), short_text, full_raw_text, comment.id))
-                    
-                    # ====== 屏蔽名单与区域构建 ======
                     stats_blacklist = task.get('stats_blacklist', [])
                     blacklist_section = ""
                     if stats_blacklist:
                         bl_title = task.get('blacklist_title', '🚫本月轮换限制：')
                         bl_names = "\n".join([html.escape(n) for n in stats_blacklist])
-                        if bl_title:
-                            blacklist_section = f"\n{html.escape(bl_title)}\n<blockquote>{bl_names}</blockquote>\n"
-                        else:
-                            blacklist_section = f"\n<blockquote>{bl_names}</blockquote>\n"
-
+                        if bl_title: blacklist_section = f"\n{html.escape(bl_title)}\n<blockquote>{bl_names}</blockquote>\n"
+                        else: blacklist_section = f"\n<blockquote>{bl_names}</blockquote>\n"
                     stats_section = ""
                     all_comments_for_file = []
-                    
                     if comments_data_list:
                         comments_data_list.sort(key=lambda x: x[0], reverse=True)
-                        
                         deduped_comments = []
                         for item in comments_data_list:
                             total, safe_text, raw_short, full_raw, c_id = item
                             base_name = re.split(r'[（(]', full_raw)[0].strip()
-                            
                             is_blocked = False
                             for blocked in stats_blacklist:
                                 if blocked and len(blocked) >= 2:
                                     if blocked in full_raw or blocked in base_name:
-                                        is_blocked = True
-                                        break
-                            if is_blocked:
-                                continue
-                            
+                                        is_blocked = True; break
+                            if is_blocked: continue
                             conflict = False
                             for added_item in deduped_comments:
                                 added_full_raw = added_item[3]
@@ -971,45 +994,35 @@ def start_telethon_worker():
                                 if (len(base_name) >= 2 and base_name in added_full_raw) or (len(added_base) >= 2 and added_base in full_raw):
                                     conflict = True; break
                             if not conflict: deduped_comments.append(item)
-                            
                         comments_data_list = deduped_comments
                         completed_items = []
-                        
                         try:
                             async for newer_msg in TL_CLIENT.iter_messages(ch_id, limit=100, min_id=msg_id):
                                 if newer_msg.id == msg_id: continue
                                 if not newer_msg.raw_text or trigger_tag.lower() not in newer_msg.raw_text.lower(): continue
-                                
                                 if newer_msg.entities:
                                     html_text = tl_html.unparse(newer_msg.raw_text, newer_msg.entities)
                                     text_no_bq = re.sub(r'<blockquote.*?>.*?</blockquote>', '', html_text, flags=re.DOTALL)
                                     clean_text = html.unescape(re.sub(r'<.*?>', '', text_no_bq))
-                                else:
-                                    clean_text = newer_msg.raw_text
-                                    
+                                else: clean_text = newer_msg.raw_text
                                 if trigger_tag.lower() not in clean_text.lower(): continue
-                                found_tags = re.findall(r'#([A-Za-z0-9_\u4e00-\u9fa5]+)', clean_text)
-                                
+                                # 🔧 Fix 2: 用 extract_tags 提取（无 #）
+                                found_tags = [t[1:] for t in extract_tags(clean_text)]
                                 for item in comments_data_list:
-                                    raw_short = item[2]
-                                    full_raw = item[3]
+                                    raw_short = item[2]; full_raw = item[3]
                                     base_name = re.split(r'[（(]', full_raw)[0].strip()
                                     for tag in found_tags:
                                         if (len(tag) >= 2 and tag.lower() in full_raw.lower()) or (len(base_name) >= 2 and base_name.lower() in tag.lower()):
                                             if raw_short not in completed_items: completed_items.append(raw_short)
                                             break
                         except Exception: pass
-                        
                         if task.get('completed_items') != completed_items:
                             task['completed_items'] = completed_items; data_changed = True
-                            
                         comments_data_list.sort(key=lambda x: (x[2] in completed_items, x[0]), reverse=True)
                         all_comments_for_file = comments_data_list.copy()
-                        
                         comments_data_list = comments_data_list[:top_n]
                         completed_count = sum(1 for item in comments_data_list if item[2] in completed_items)
                         max_digits = max([len(str(item[0])) for item in comments_data_list] + [1])
-                        
                         inner_lines = []
                         for rank, item in enumerate(comments_data_list):
                             total, safe_text, raw_short, full_raw, c_id = item
@@ -1017,98 +1030,56 @@ def start_telethon_worker():
                             display_text = f"<s>{safe_text}</s>" if raw_short in completed_items else safe_text
                             padded_total = str(total).rjust(max_digits, ' ')
                             inner_lines.append(f"{medal} <code>{padded_total}</code> 赞 ｜ <i>{display_text}</i>")
-                        
                         beijing_tz = timezone(timedelta(hours=8))
                         now_str = datetime.now(beijing_tz).strftime("%m-%d %H:%M")
                         inner_lines.append(f"\n⏳ <code>最后更新: {now_str} (北京时间)</code>")
-                        
-                        # ====== 🌟 将榜单存储为网页，并把链接拼接到标题旁边 ======
                         if all_comments_for_file:
                             c_chat_str = str(discussion_chat_id).replace("-100", "") if discussion_chat_id else ""
                             list_html = ""
                             for rank, item in enumerate(all_comments_for_file, 1):
                                 total, safe_text, raw_short, full_raw, c_id = item
-                                if c_chat_str and thread_id:
-                                    link = f"tg://privatepost?channel={c_chat_str}&post={c_id}&thread={thread_id}"
-                                elif c_chat_str:
-                                    link = f"tg://privatepost?channel={c_chat_str}&post={c_id}"
-                                else:
-                                    link = "#"
-                                
+                                if c_chat_str and thread_id: link = f"tg://privatepost?channel={c_chat_str}&post={c_id}&thread={thread_id}"
+                                elif c_chat_str: link = f"tg://privatepost?channel={c_chat_str}&post={c_id}"
+                                else: link = "#"
                                 display_name = html.escape(full_raw)
-                                if raw_short in completed_items:
-                                    display_name = f"<s style='opacity: 0.5;'>{display_name}</s>"
-                                
+                                if raw_short in completed_items: display_name = f"<s style='opacity: 0.5;'>{display_name}</s>"
                                 list_html += f'<a href="{link}" class="item"><span class="rank">#{rank}</span><span class="name">{display_name}</span><span class="reacts">{total} 赞</span></a>'
-                            
                             html_template = f"""<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>完整榜单 - {html.escape(table_title)}</title>
-    <style>
-        body {{ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; background: #1a1a2e; color: #eaeaea; padding: 15px; margin: 0; }}
-        .container {{ max-width: 600px; margin: 0 auto; background: #16213e; border-radius: 12px; padding: 15px; box-shadow: 0 4px 15px rgba(0,0,0,0.3); }}
-        h2 {{ text-align: center; color: #fff; margin-bottom: 20px; font-size: 18px; border-bottom: 1px solid rgba(255,255,255,0.1); padding-bottom: 10px; line-height: 1.5; }}
-        .hint {{ text-align: center; color: #5dade2; font-size: 13px; margin-top: -10px; margin-bottom: 15px; font-weight: 500; }}
-        .item {{ display: flex; justify-content: space-between; align-items: center; padding: 12px 0; border-bottom: 1px solid rgba(255,255,255,0.05); text-decoration: none; color: inherit; transition: background 0.2s; }}
-        .item:last-child {{ border-bottom: none; }}
-        .item:active {{ background: rgba(255,255,255,0.05); border-radius: 8px; }}
-        .rank {{ font-weight: bold; width: 35px; color: #e94560; font-size: 14px; }}
-        .name {{ flex: 1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; padding: 0 10px; font-size: 14px; }}
-        .reacts {{ font-weight: bold; color: #5dade2; font-size: 14px; }}
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h2>📊 {html.escape(table_title)} <br><span style="font-size:12px;color:#8a8a9a;font-weight:normal">全量数据收录 | 更新于 {now_str}</span></h2>
-        <div class="hint">💡 点击名字跳转评论投票</div>
-        {list_html}
-    </div>
-</body>
-</html>"""
+<html lang="zh-CN"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>完整榜单 - {html.escape(table_title)}</title>
+<style>body{{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:#1a1a2e;color:#eaeaea;padding:15px;margin:0}}.container{{max-width:600px;margin:0 auto;background:#16213e;border-radius:12px;padding:15px;box-shadow:0 4px 15px rgba(0,0,0,0.3)}}h2{{text-align:center;color:#fff;margin-bottom:20px;font-size:18px;border-bottom:1px solid rgba(255,255,255,0.1);padding-bottom:10px;line-height:1.5}}.hint{{text-align:center;color:#5dade2;font-size:13px;margin-top:-10px;margin-bottom:15px;font-weight:500}}.item{{display:flex;justify-content:space-between;align-items:center;padding:12px 0;border-bottom:1px solid rgba(255,255,255,0.05);text-decoration:none;color:inherit;transition:background 0.2s}}.item:last-child{{border-bottom:none}}.item:active{{background:rgba(255,255,255,0.05);border-radius:8px}}.rank{{font-weight:bold;width:35px;color:#e94560;font-size:14px}}.name{{flex:1;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:0 10px;font-size:14px}}.reacts{{font-weight:bold;color:#5dade2;font-size:14px}}</style></head>
+<body><div class="container"><h2>📊 {html.escape(table_title)} <br><span style="font-size:12px;color:#8a8a9a;font-weight:normal">全量数据收录 | 更新于 {now_str}</span></h2><div class="hint">💡 点击名字跳转评论投票</div>{list_html}</div></body></html>"""
                             cache_key = f"{ch_id}_{msg_id}"
                             HTML_CACHE[cache_key] = html_template
-                            
                             space_host = "bangdan.nine7.cc.cd"
                             file_msg_link = f"https://{space_host}/list/{cache_key}"
-
                             stats_section = f"<b>{html.escape(table_title)} ({completed_count}/{top_n}) <a href='{file_msg_link}'>完整名单</a></b>\n<blockquote>{chr(10).join(inner_lines)}</blockquote>"
-                    
                     else:
                         beijing_tz = timezone(timedelta(hours=8))
                         now_str = datetime.now(beijing_tz).strftime("%m-%d %H:%M")
                         stats_section = f"<b>{html.escape(table_title)} (0/{top_n})</b>\n<blockquote>暂无评论数据\n\n⏳ <code>最后更新: {now_str} (北京时间)</code></blockquote>"
-
                     new_message_text = f"{base_html}{SEPARATOR_MARK}{blacklist_section}{stats_section}"
                     content_hash = f"{blacklist_section}|{stats_section}"
-                    
                     if task.get('last_html_stats') != content_hash:
                         try:
                             if original_msg.photo or original_msg.video or original_msg.document: bot.edit_message_caption(caption=new_message_text, chat_id=ch_id, message_id=msg_id, parse_mode="HTML")
                             else: bot.edit_message_text(text=new_message_text, chat_id=ch_id, message_id=msg_id, parse_mode="HTML")
                             task['last_html_stats'] = content_hash; data_changed = True
                         except Exception: pass
-
                     task['last_run'] = current_time; data_changed = True; await asyncio.sleep(2)
-                except Exception: 
-                    pass
+                except Exception: pass
         if data_changed: await asyncio.to_thread(save_data)
 
+    # 🔧 Fix 1 + Fix 2: 目录任务 - 扫描频道与多目标更新
     async def update_channel_dirs():
         current_time = int(time.time())
         data_changed = False
         for uid, u_data in DATA.get("users", {}).items():
             tasks = u_data.get("dir_tasks", [])
             for task in tasks:
-                # 🌟 分离【目标写入频道】与【源扫描频道】
-                ch_id = int(task['channel_id'])  # 目标承载频道
-                msg_id = int(task['msg_id'])
-                
-                # 如果有独立指定的扫描源频道，用它；否则默认用目标频道
-                scan_ch_id = int(task.get('scan_channel_id', task['channel_id'])) 
-                
+                migrate_dir_task(task)
+                scan_ch = int(task['scan_channel'])
+                targets = task.get('targets', [])
+                if not targets: continue
                 blacklist = task.get('blacklist', [])
                 tags_map = task.get('tags_map', {})
                 scanned_msgs = task.get('scanned_msgs', {})
@@ -1117,21 +1088,10 @@ def start_telethon_worker():
                 is_first_run = not bool(scanned_msgs)
                 scan_kwargs = {'limit': None if is_first_run else 150}
                 new_tags_found = False
-                
-                try:
-                    # 🌟 获取承载消息时，依旧去目标承载频道(ch_id)找
-                    original_msg = await TL_CLIENT.get_messages(ch_id, ids=msg_id)
-                    if not original_msg: continue
-                    if original_msg.raw_text:
-                        raw_html = tl_html.unparse(original_msg.raw_text, original_msg.entities)
-                        base_html = raw_html.split("➖➖➖➖➖➖")[0].rstrip() if "➖➖➖➖➖➖" in raw_html else raw_html.rstrip()
-                    else: base_html = ""
-                except Exception: continue
-                
+
+                # 扫描 scan_channel (不一定与 target channel 相同)
                 try:
-                    # 🌟 迭代历史消息提取标签时，去源扫描频道(scan_ch_id)扫
-                    async for msg in TL_CLIENT.iter_messages(scan_ch_id, **scan_kwargs):
-                        if scan_ch_id == ch_id and msg.id == msg_id: continue # 防止自扫自改
+                    async for msg in TL_CLIENT.iter_messages(scan_ch, **scan_kwargs):
                         msg_id_str = str(msg.id)
                         msg_time = msg.edit_date.timestamp() if msg.edit_date else msg.date.timestamp()
                         if scanned_msgs.get(msg_id_str) == msg_time: continue
@@ -1144,8 +1104,7 @@ def start_telethon_worker():
                                 html_text = tl_html.unparse(msg.raw_text, msg.entities)
                                 text_without_bq = re.sub(r'<blockquote.*?>.*?</blockquote>', '', html_text, flags=re.DOTALL)
                                 clean_text = html.unescape(re.sub(r'<.*?>', '', text_without_bq))
-                            found_tags = re.findall(r'#[A-Za-z0-9_\u4e00-\u9fa5\s&+\-/Detail\u200d\u2600-\u27bf\U0001f000-\U0001f9ff]+', clean_text)
-                            found_tags = [t.strip() for t in found_tags if t.strip() > '#']
+                            found_tags = extract_tags(clean_text)
                         if found_tags:
                             tags_map[msg_id_str] = found_tags
                             new_tags_found = True
@@ -1153,68 +1112,73 @@ def start_telethon_worker():
                             if msg_id_str in tags_map:
                                 del tags_map[msg_id_str]
                                 new_tags_found = True
-                                
                     task['last_run'] = current_time
-                    if new_tags_found or is_first_run:
-                        task['tags_map'] = tags_map
-                        task['scanned_msgs'] = scanned_msgs
-                        data_changed = True
-                        all_tags = set()
-                        for t_list in tags_map.values(): all_tags.update(t_list)
-                        active_tags = [t for t in all_tags if t not in blacklist]
-                        task['tags_cache'] = active_tags
-                        directory_map = {}
-                        for tag in active_tags:
-                            clean_str = tag[1:]
-                            if not clean_str: continue
-                            fc = clean_str[0]
-                            key = "#"
-                            if fc.isalpha() and fc.isascii(): key = fc.upper()
-                            elif fc.isdigit(): key = "0-9"
-                            elif '\u4e00' <= fc <= '\u9fff':
-                                try:
-                                    py = lazy_pinyin(fc)
-                                    if py and len(py[0])>0: key = py[0][0].upper()
-                                except NameError: key = "中文"
-                            if key not in directory_map: directory_map[key] = []
-                            directory_map[key].append(tag)
-                        
-                        lines = ["目录：\n<blockquote expandable>"]
-                        keys = sorted(directory_map.keys())
-                        if "0-9" in keys: keys.remove("0-9"); keys.insert(0, "0-9")
-                        
-                        # 🚀 自动化同步渲染：支持全量数字、Emoji及组合参数检索
-                        scan_ch_pure_str = str(scan_ch_id).replace("-100", "")
-                        for key in keys:
-                            linked_tags = []
-                            for t in sorted(directory_map[key]):
-                                safe_search_text = quote(t)
-                                # 点击直接向【被扫描的源频道】发起专属协议搜索，100%原生点击追踪高亮！
-                                tg_search_link = f"tg://resolve?domain=c/{scan_ch_pure_str}&query={safe_search_text}"
-                                linked_tags.append(f'<a href="{tg_search_link}">{html.escape(t)}</a>')
-                            
-                            tags_line = "  ".join(linked_tags)
-                            lines.append(f"<b>{key}</b>: {tags_line}\n")
-                        
-                        lines.append("</blockquote>")
-                        beijing_tz = timezone(timedelta(hours=8))
-                        now_str = datetime.now(beijing_tz).strftime("%m-%d %H:%M")
-                        lines.append(f"\n⏳ <code>最后更新: {now_str} (北京时间)</code>")
-                        stats_text = "\n".join(lines)
-                        
-                        task_name = task.get('task_name', '标签目录')
-                        safe_title_with_count = f"{html.escape(task_name)} ({len(active_tags)})"
+                except Exception: continue
+
+                if new_tags_found or is_first_run:
+                    task['tags_map'] = tags_map
+                    task['scanned_msgs'] = scanned_msgs
+                    data_changed = True
+                    all_tags = set()
+                    for t_list in tags_map.values(): all_tags.update(t_list)
+                    active_tags = [t for t in all_tags if t not in blacklist]
+                    task['tags_cache'] = active_tags
+
+                    # 构建目录文本
+                    directory_map = {}
+                    for tag in active_tags:
+                        key = classify_tag_key(tag)
+                        if key is None: continue
+                        if key not in directory_map: directory_map[key] = []
+                        directory_map[key].append(tag)
+
+                    lines = ["目录：\n<blockquote expandable>"]
+                    keys = sorted(directory_map.keys())
+                    if "0-9" in keys: keys.remove("0-9"); keys.insert(0, "0-9")
+                    for key in keys:
+                        tags_line = " ".join([html.escape(t) for t in sorted(directory_map[key])])
+                        lines.append(f"{key}: {tags_line}\n")
+                    lines.append("</blockquote>")
+                    beijing_tz = timezone(timedelta(hours=8))
+                    now_str = datetime.now(beijing_tz).strftime("%m-%d %H:%M")
+                    lines.append(f"\n⏳ <code>最后更新: {now_str} (北京时间)</code>")
+                    stats_text = f"<blockquote>{chr(10).join(lines)}</blockquote>"
+                    task_name = task.get('task_name', '标签目录')
+                    safe_title_with_count = f"{html.escape(task_name)} ({len(active_tags)})"
+
+                    # 🔧 Fix 1: 遍历所有 targets 更新
+                    last_html_dir = task.get('last_html_dir', {})
+                    if isinstance(last_html_dir, str): last_html_dir = {}
+
+                    for tgt in targets:
+                        tgt_ch = int(tgt['channel_id'])
+                        tgt_msg = int(tgt['msg_id'])
+                        tgt_key = f"{tgt_ch}_{tgt_msg}"
+                        try:
+                            original_msg = await TL_CLIENT.get_messages(tgt_ch, ids=tgt_msg)
+                            if not original_msg: continue
+                            if original_msg.raw_text:
+                                raw_html = tl_html.unparse(original_msg.raw_text, original_msg.entities)
+                                base_html = raw_html.split("➖➖➖➖➖➖")[0].rstrip() if "➖➖➖➖➖➖" in raw_html else raw_html.rstrip()
+                            else: base_html = ""
+                        except Exception: continue
+
                         new_message_text = f"{base_html}{SEPARATOR_MARK}<b>{safe_title_with_count}</b>\n{stats_text}"
-                        if len(new_message_text) > 4000: new_message_text = new_message_text[:4000] + "\n... </blockquote>\n⚠️ 目录过长已截断"
-                        if task.get('last_html_dir') != stats_text:
+                        if len(new_message_text) > 4000:
+                            new_message_text = new_message_text[:4000] + "\n... </blockquote>\n⚠️ 目录过长已截断"
+
+                        if last_html_dir.get(tgt_key) != stats_text:
                             try:
-                                # 🌟 写入时，目标始终是承载频道 (ch_id)
-                                if original_msg.photo or original_msg.video or original_msg.document: bot.edit_message_caption(caption=new_message_text, chat_id=ch_id, message_id=msg_id, parse_mode="HTML")
-                                else: bot.edit_message_text(text=new_message_text, chat_id=ch_id, message_id=msg_id, parse_mode="HTML")
-                                task['last_html_dir'] = stats_text
+                                if original_msg.photo or original_msg.video or original_msg.document:
+                                    bot.edit_message_caption(caption=new_message_text, chat_id=tgt_ch, message_id=tgt_msg, parse_mode="HTML")
+                                else:
+                                    bot.edit_message_text(text=new_message_text, chat_id=tgt_ch, message_id=tgt_msg, parse_mode="HTML")
+                                last_html_dir[tgt_key] = stats_text
                                 data_changed = True
                             except Exception: pass
-                except Exception: pass
+                        await asyncio.sleep(2)
+
+                    task['last_html_dir'] = last_html_dir
         if data_changed: await asyncio.to_thread(save_data)
 
     TL_CLIENT.start()
@@ -1236,8 +1200,7 @@ def add_security_headers(response):
 
 def validate_webapp(req):
     init_data = req.headers.get('X-Init-Data', '')
-    if not init_data:
-        return None
+    if not init_data: return None
     try:
         parsed = {}
         for part in init_data.split('&'):
@@ -1245,18 +1208,13 @@ def validate_webapp(req):
                 k, v = part.split('=', 1)
                 parsed[k] = unquote(v)
         check_hash = parsed.pop('hash', None)
-        if not check_hash or not BOT_TOKEN:
-            return None
+        if not check_hash or not BOT_TOKEN: return None
         data_check_string = "\n".join(f"{k}={parsed[k]}" for k in sorted(parsed.keys()))
         secret_key = hmac.new(b"WebAppData", BOT_TOKEN.encode(), hashlib.sha256).digest()
         computed = hmac.new(secret_key, data_check_string.encode(), hashlib.sha256).hexdigest()
-        if not hmac.compare_digest(computed, check_hash):
-            print("⛔ HMAC 签名不匹配")
-            return None
+        if not hmac.compare_digest(computed, check_hash): return None
         auth_date = int(parsed.get('auth_date', 0))
-        if abs(time.time() - auth_date) > 86400:
-            print("⛔ initData 已过期")
-            return None
+        if abs(time.time() - auth_date) > 86400: return None
         user_obj = json.loads(parsed.get('user', '{}'))
         uid = str(user_obj.get('id', ''))
         if uid and uid not in DATA["users"]:
@@ -1271,27 +1229,21 @@ def need_auth(f):
     @wraps(f)
     def wrapper(*args, **kwargs):
         uid = validate_webapp(request)
-        if not uid:
-            return jsonify({"ok": False, "msg": "未授权"}), 401
-        if check_rate_limit(uid):
-            return jsonify({"ok": False, "msg": "操作太频繁，请稍后再试"}), 429
+        if not uid: return jsonify({"ok": False, "msg": "未授权"}), 401
+        if check_rate_limit(uid): return jsonify({"ok": False, "msg": "操作太频繁，请稍后再试"}), 429
         return f(uid, *args, **kwargs)
     return wrapper
 
 @app.route('/')
-def home():
-    return "Bot is running"
+def home(): return "Bot is running"
 
 @app.route('/webapp')
-def webapp_page():
-    return send_file('webapp.html')
+def webapp_page(): return send_file('webapp.html')
 
-# 👇 新增路由：专门用于分发生成的完整榜单外部网页
 @app.route('/list/<cache_key>')
 def view_list(cache_key):
     html_content = HTML_CACHE.get(cache_key)
-    if not html_content:
-        return "暂无数据或页面已刷新，请等待机器人下次更新", 404
+    if not html_content: return "暂无数据或页面已刷新，请等待机器人下次更新", 404
     return html_content
 
 @app.route('/api/data')
@@ -1365,8 +1317,7 @@ def api_edit_stat(uid, idx):
     field, val = d["field"], d["value"]
     try:
         task = DATA["users"][uid]["stats_tasks"][idx]
-        if field in ("top_n", "interval", "duration"):
-            task[field] = int(val)
+        if field in ("top_n", "interval", "duration"): task[field] = int(val)
         elif field == "msg_id":
             if val.startswith('http'): val = val.split('/')[-1]
             task["msg_id"] = val
@@ -1387,12 +1338,9 @@ def api_edit_stat(uid, idx):
         elif field == "blacklist_title":
             task["blacklist_title"] = "" if val.strip() == "无" else val.strip()
             task["last_html_stats"] = ""
-        else:
-            task[field] = val
-        
+        else: task[field] = val
         task["last_html_stats"] = ""
         task["last_run"] = 0
-        
         save_data()
         return jsonify({"ok": True, "user": DATA["users"][uid]})
     except Exception as e:
@@ -1407,25 +1355,27 @@ def api_del_stat(uid, idx):
         return jsonify({"ok": True, "user": DATA["users"][uid]})
     except: return jsonify({"ok": False, "msg": "索引无效"})
 
+# 🔧 Fix 1: 目录API - 新结构
 @app.route('/api/dirs', methods=['POST'])
 @need_auth
 def api_add_dir(uid):
     d = request.json
-    msg_id_raw = str(d.get("msg_id", ""))
-    if msg_id_raw.startswith('http'): msg_id_raw = msg_id_raw.split('/')[-1]
-    
+    scan_channel = d.get("scan_channel", d.get("channel_id", ""))
+    targets = d.get("targets", [])
+    if not targets:
+        msg_id_raw = str(d.get("msg_id", ""))
+        if msg_id_raw.startswith('http'): msg_id_raw = msg_id_raw.split('/')[-1]
+        targets = [{"channel_id": d.get("channel_id", scan_channel), "msg_id": msg_id_raw}]
     DATA["users"][uid].setdefault("dir_tasks", []).append({
-        "task_name": d["task_name"], 
-        "scan_channel_id": d["scan_channel_id"], # 🌟 新增存储：源扫描频道
-        "channel_id": d["channel_id"],           # 目标承载频道
-        "msg_id": msg_id_raw,
-        "blacklist": d.get("blacklist", []), 
-        "interval": 15,
-        "tags_cache": [], "tags_map": {}, "scanned_msgs": {}, "last_html_dir": ""
+        "task_name": d["task_name"], "scan_channel": scan_channel,
+        "targets": targets, "blacklist": d.get("blacklist", []),
+        "interval": 15, "tags_cache": [], "tags_map": {},
+        "scanned_msgs": {}, "last_html_dir": {}
     })
     save_data()
     return jsonify({"ok": True, "user": DATA["users"][uid]})
 
+# 🔧 Fix 1: 目录编辑API - 支持 add_target / rm_target
 @app.route('/api/dirs/<int:idx>', methods=['PUT'])
 @need_auth
 def api_edit_dir(uid, idx):
@@ -1433,6 +1383,7 @@ def api_edit_dir(uid, idx):
     field, val = d["field"], d["value"]
     try:
         task = DATA["users"][uid]["dir_tasks"][idx]
+        migrate_dir_task(task)
         if field == "add_blacklist":
             task["blacklist"].extend(val.split())
             task["blacklist"] = list(set(task["blacklist"]))
@@ -1441,12 +1392,16 @@ def api_edit_dir(uid, idx):
             task["blacklist"] = [t for t in task["blacklist"] if t not in to_rem]
         elif field == "interval":
             task["interval"] = int(val)
-        elif field in ("scan_channel_id", "channel_id", "msg_id"): # 🌟 允许编辑跨频道属性
-            if field == "msg_id" and val.startswith('http'): val = val.split('/')[-1]
-            task[field] = val
-            task["tags_map"] = {}
-            task["scanned_msgs"] = {}
-            task["last_html_dir"] = ""
+        elif field == "add_target":
+            parts = val.strip().split()
+            if len(parts) >= 2:
+                msg_id = parts[1]
+                if msg_id.startswith('http'): msg_id = msg_id.split('/')[-1]
+                task.setdefault("targets", []).append({"channel_id": parts[0], "msg_id": msg_id})
+        elif field == "rm_target":
+            tgt_idx = int(val)
+            targets = task.get("targets", [])
+            if 0 <= tgt_idx < len(targets): targets.pop(tgt_idx)
         save_data()
         return jsonify({"ok": True, "user": DATA["users"][uid]})
     except Exception as e:
@@ -1537,19 +1492,14 @@ def api_backup(uid):
     except Exception as e:
         return jsonify({"ok": False, "msg": str(e)})
 
-# ====== SSE 实时事件流 ======
 @app.route('/api/events')
 def api_events():
     class FakeReq:
         def __init__(self, init_data_str):
             self.headers = {'X-Init-Data': init_data_str}
-
     init_data_str = request.args.get('init_data', '')
     uid = validate_webapp(FakeReq(init_data_str))
-
-    if not uid:
-        return jsonify({"ok": False, "msg": "未授权"}), 401
-
+    if not uid: return jsonify({"ok": False, "msg": "未授权"}), 401
     def stream():
         q = _event_queues[uid]
         yield f"data: {json.dumps({'type': 'connected', 'data': '🟢 实时连接已建立'})}\n\n"
@@ -1559,31 +1509,15 @@ def api_events():
                 yield f"data: {json.dumps(event)}\n\n"
             except queue.Empty:
                 yield f": heartbeat\n\n"
-
-    return Response(
-        stream(),
-        mimetype='text/event-stream',
-        headers={
-            'Cache-Control': 'no-cache',
-            'X-Accel-Buffering': 'no',
-            'Connection': 'keep-alive'
-        }
-    )
+    return Response(stream(), mimetype='text/event-stream', headers={'Cache-Control': 'no-cache', 'X-Accel-Buffering': 'no', 'Connection': 'keep-alive'})
 
 @app.route('/api/health')
 def api_health():
-    return jsonify({
-        "status": "ok",
-        "users": len(DATA.get("users", {})),
-        "msg_map": len(DATA.get("msg_map", {})),
-        "telethon": TL_CLIENT is not None
-    })
+    return jsonify({"status": "ok", "users": len(DATA.get("users", {})), "msg_map": len(DATA.get("msg_map", {})), "telethon": TL_CLIENT is not None})
 
-# ===== 5. 启动点 =====
 if __name__ == "__main__":
     Thread(target=lambda: app.run(host="0.0.0.0", port=7860), daemon=True).start()
     Thread(target=start_telethon_worker, daemon=True).start()
-
     print("🔄 正在清除旧连接...")
     for attempt in range(5):
         try:
@@ -1593,18 +1527,11 @@ if __name__ == "__main__":
         except Exception as e:
             print(f"⏳ 等待旧实例释放... ({attempt+1}/5) {e}")
             time.sleep(3)
-
     print("🤖 Telebot 主消息引擎已启动！")
     print("🌐 Mini App 地址: http://localhost:7860/webapp")
-
     while True:
         try:
-            bot.infinity_polling(
-                timeout=60,
-                long_polling_timeout=60,
-                allowed_updates=["message", "callback_query",
-                                 "channel_post", "edited_channel_post"]
-            )
+            bot.infinity_polling(timeout=60, long_polling_timeout=60, allowed_updates=["message", "callback_query", "channel_post", "edited_channel_post"])
         except Exception as e:
             print(f"❌ Polling 异常: {e}")
             print("⏳ 10秒后重连...")
@@ -1612,5 +1539,4 @@ if __name__ == "__main__":
             try:
                 bot.remove_webhook()
                 bot.get_updates(offset=-1, timeout=1)
-            except:
-                pass
+            except: pass