Add scheduled member backups and message editing

app.py

@@ -33,7 +33,7 @@ from telebot import types, apihelper
 from telebot.apihelper import ApiTelegramException
 from flask import Flask, request, jsonify, send_file, Response
 from webdav4.client import Client as WebDAVClient
-from telethon import TelegramClient, events
+from telethon import TelegramClient
 from telethon.sessions import StringSession
 from telethon.extensions import html as tl_html
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
@@ -907,6 +907,52 @@ def run_backup_members(uid, ch_id):
     except: pass
     push_event(uid, "members_done", f"✅ 成员备份完成：{len(members)} 人")
 
+def _member_backup_paths(uid, ch_id):
+    safe_channel = re.sub(r'[^0-9A-Za-z_-]+', '_', str(ch_id)).strip('_') or "channel"
+    remote_dir = f"members/{uid}"
+    return remote_dir, f"{remote_dir}/{safe_channel}.csv", f"members_{safe_channel}.csv"
+
+def _write_member_csv(members, path):
+    with open(path, 'w', encoding='utf-8-sig', newline='') as f:
+        writer = csv.writer(f)
+        writer.writerow(['UserID','Username','FirstName','LastName','IsBot','BackupTime'])
+        backup_time = datetime.now(timezone.utc).isoformat()
+        for member in members:
+            writer.writerow([member.id, f"@{member.username}" if member.username else '',
+                member.first_name or '', member.last_name or '', '是' if member.bot else '否', backup_time])
+
+def _upload_member_backup(uid, ch_id, members):
+    remote_dir, remote_path, filename = _member_backup_paths(uid, ch_id)
+    temp_path = os.path.join(tempfile.gettempdir(), filename)
+    try:
+        _write_member_csv(members, temp_path)
+        dav = get_dav_client()
+        for directory in ("members", remote_dir):
+            try:
+                if not dav.exists(directory): dav.mkdir(directory)
+            except Exception: pass
+        dav.upload_file(temp_path, remote_path, overwrite=True)
+        return remote_path
+    finally:
+        try: os.remove(temp_path)
+        except OSError: pass
+
+def send_member_backup(uid, ch_id):
+    _, remote_path, filename = _member_backup_paths(uid, ch_id)
+    temp_path = os.path.join(tempfile.gettempdir(), f"download_{uid}_{filename}")
+    try:
+        dav = get_dav_client()
+        if not dav.exists(remote_path):
+            return bot.send_message(uid, "⚠️ 该频道还没有可下载的成员备份，请等待首次检测完成。")
+        dav.download_file(remote_path, temp_path)
+        with open(temp_path, 'rb') as f:
+            bot.send_document(uid, f, caption=f"📋 频道 `{ch_id}` 成员备份", parse_mode="Markdown")
+    except Exception as e:
+        bot.send_message(uid, f"❌ 下载成员备份失败: {e}")
+    finally:
+        try: os.remove(temp_path)
+        except OSError: pass
+
 
 def run_smart_backup_v2(latest_id, uid, src, tgt, wash=False):
     global TL_LOOP, TL_CLIENT
@@ -1282,21 +1328,26 @@ def start_telethon_worker():
     TL_LOOP = asyncio.new_event_loop(); asyncio.set_event_loop(TL_LOOP)
     TL_CLIENT = TelegramClient(StringSession(user_session), int(api_id_str), api_hash)
 
-    @TL_CLIENT.on(events.ChatAction)
-    async def record_joined_member(event):
-        if not (event.user_joined or event.user_added): return
-        channel_id = str(event.chat_id); users = await event.get_users()
-        if not isinstance(users, list): users = [users]
-        changed = False
-        for u_data in DATA.get("users", {}).values():
+    async def update_member_backups():
+        current_time = int(time.time()); data_changed = False
+        for uid, u_data in DATA.get("users", {}).items():
             for monitor in u_data.get("member_monitors", []):
-                if str(monitor.get("channel_id")) != channel_id: continue
-                records = monitor.setdefault("members", [])
-                for user in users:
-                    if not user: continue
-                    records.append({"id":user.id,"username":user.username or "","first_name":user.first_name or "","last_name":user.last_name or "","bot":bool(user.bot),"joined_at":int(time.time())})
-                    changed = True
-        if changed: await asyncio.to_thread(save_data)
+                interval_sec = max(1, int(monitor.get("interval", 60))) * 60
+                if current_time - int(monitor.get("last_run", 0)) < interval_sec: continue
+                ch_id = str(monitor.get("channel_id", "")).strip()
+                if not ch_id: continue
+                try:
+                    members = [member async for member in TL_CLIENT.iter_participants(int(ch_id))]
+                    remote_path = await asyncio.to_thread(_upload_member_backup, uid, ch_id, members)
+                    monitor.pop("members", None)
+                    monitor.update({"last_run":current_time, "member_count":len(members),
+                        "remote_path":remote_path, "last_error":""})
+                except Exception as e:
+                    monitor.update({"last_run":current_time, "last_error":str(e)})
+                    print(f"❌ [成员备份] {ch_id}: {e}")
+                data_changed = True
+                await asyncio.sleep(1)
+        if data_changed: await asyncio.to_thread(save_data)
 
     async def update_channel_msg():
         current_time = int(time.time()); data_changed = False
@@ -1513,6 +1564,7 @@ def start_telethon_worker():
     TL_CLIENT.start()
     scheduler = AsyncIOScheduler(event_loop=TL_LOOP)
     scheduler.add_job(update_channel_msg, 'interval', seconds=10)
+    scheduler.add_job(update_member_backups, 'interval', seconds=10)
     scheduler.add_job(update_channel_dirs, 'interval', seconds=15)
     scheduler.start()
     print("🚀 Telethon 后台已启动！")
@@ -1711,6 +1763,15 @@ def api_edit_dir(uid, idx):
             tis = task.get("targets",[]); ti_idx=int(val)
             if 0<=ti_idx<len(tis):
                 rm=tis.pop(ti_idx); task.get("last_html_per_target",{}).pop(f"{rm['channel_id']}_{rm['msg_id']}",None)
+        elif field == "target_msg_id":
+            update = json.loads(val); ti_idx = int(update.get("index", -1))
+            tis = task.get("targets", [])
+            if not 0 <= ti_idx < len(tis): raise ValueError("目标索引无效")
+            mid = str(update.get("msg_id", "")).strip()
+            if mid.startswith('http'): mid = mid.split('/')[-1]
+            if not mid.isdigit(): raise ValueError("消息 ID 必须是数字或消息链接")
+            old = tis[ti_idx]; task.get("last_html_per_target",{}).pop(f"{old['channel_id']}_{old['msg_id']}",None)
+            old["msg_id"] = mid
         save_data(); return jsonify({"ok":True,"user":DATA["users"][uid]})
     except Exception as e: return jsonify({"ok":False,"msg":str(e)})
 
@@ -1795,15 +1856,33 @@ def api_btn_new_media(uid):
 @app.route('/api/btn_old', methods=['POST'])
 @need_auth
 def api_btn_old(uid):
-    d = request.json; msg_id = d["msg_id"]
+    is_multipart = bool(request.files) or request.mimetype == 'multipart/form-data'
+    d = request.form if is_multipart else (request.get_json(silent=True) or {})
+    msg_id = str(d["msg_id"])
     if msg_id.startswith('http'): msg_id=msg_id.split('/')[-1]
     try:
-        if d["btn_text"].strip()=="删除":
-            bot.edit_message_reply_markup(chat_id=d["ch_id"],message_id=int(msg_id),reply_markup=None)
-        else:
-            markup = types.InlineKeyboardMarkup()
-            markup.add(types.InlineKeyboardButton(text=d["btn_text"],url=d["url"]))
-            bot.edit_message_reply_markup(chat_id=d["ch_id"],message_id=int(msg_id),reply_markup=markup)
+        buttons = _parse_button_payload(d.get("buttons", []))
+        if not buttons and d.get("btn_text") and str(d.get("btn_text")).strip() != "删除":
+            buttons = _parse_button_payload([{"text":d.get("btn_text"), "url":d.get("url")}])
+        markup = _button_markup(buttons)
+        ch_id = str(d["ch_id"]); text = str(d.get("text", "")); media = request.files.get("media") if is_multipart else None
+        if media and media.filename:
+            suffix = os.path.splitext(media.filename)[1].lower()
+            tmp = tempfile.NamedTemporaryFile(prefix="edit_media_", suffix=suffix, delete=False); tmp_path=tmp.name; tmp.close(); media.save(tmp_path)
+            try:
+                with open(tmp_path, 'rb') as f:
+                    if suffix in ('.jpg','.jpeg','.png','.webp'): input_media=types.InputMediaPhoto(f, caption=text, parse_mode='HTML')
+                    elif suffix in ('.mp4','.mov','.avi','.mkv','.webm'): input_media=types.InputMediaVideo(f, caption=text, parse_mode='HTML')
+                    elif suffix == '.gif': input_media=types.InputMediaAnimation(f, caption=text, parse_mode='HTML')
+                    else: input_media=types.InputMediaDocument(f, caption=text, parse_mode='HTML')
+                    bot.edit_message_media(input_media, chat_id=ch_id, message_id=int(msg_id), reply_markup=markup)
+            finally:
+                try: os.unlink(tmp_path)
+                except OSError: pass
+        elif text:
+            try: bot.edit_message_text(text, chat_id=ch_id, message_id=int(msg_id), parse_mode='HTML', reply_markup=markup)
+            except Exception: bot.edit_message_caption(caption=text, chat_id=ch_id, message_id=int(msg_id), parse_mode='HTML', reply_markup=markup)
+        else: bot.edit_message_reply_markup(chat_id=ch_id, message_id=int(msg_id), reply_markup=markup)
         return jsonify({"ok":True})
     except Exception as e: return jsonify({"ok":False,"msg":str(e)})
 
@@ -1912,9 +1991,31 @@ def api_add_member_monitor(uid):
     if not ch_id: return jsonify({"ok":False,"msg":"请输入频道ID"})
     monitors = DATA["users"][uid].setdefault("member_monitors", [])
     if any(str(item.get("channel_id")) == ch_id for item in monitors): return jsonify({"ok":False,"msg":"该频道已在监控中"})
-    monitors.append({"channel_id":ch_id,"started_at":int(time.time()),"members":[]})
+    try: interval = max(1, int(d.get('interval', 60)))
+    except (TypeError, ValueError): return jsonify({"ok":False,"msg":"检测间隔必须是整数分钟"})
+    monitors.append({"channel_id":ch_id,"started_at":int(time.time()),"interval":interval,
+        "last_run":0,"member_count":0,"remote_path":"","last_error":""})
     save_data(); return jsonify({"ok":True,"user":DATA["users"][uid]})
 
+@app.route('/api/member_monitors/<path:cid>', methods=['PUT'])
+@need_auth
+def api_edit_member_monitor(uid, cid):
+    try: interval = max(1, int((request.json or {}).get('interval', 60)))
+    except (TypeError, ValueError): return jsonify({"ok":False,"msg":"检测间隔必须是整数分钟"})
+    for monitor in DATA["users"][uid].setdefault("member_monitors", []):
+        if str(monitor.get("channel_id")) == cid:
+            monitor["interval"] = interval; monitor["last_run"] = 0; save_data()
+            return jsonify({"ok":True,"user":DATA["users"][uid]})
+    return jsonify({"ok":False,"msg":"监控任务不存在"}), 404
+
+@app.route('/api/member_monitors/<path:cid>/download', methods=['POST'])
+@need_auth
+def api_download_member_monitor(uid, cid):
+    monitor = next((m for m in DATA["users"][uid].setdefault("member_monitors", []) if str(m.get("channel_id")) == cid), None)
+    if not monitor: return jsonify({"ok":False,"msg":"监控任务不存在"}), 404
+    Thread(target=send_member_backup, args=(uid, cid)).start()
+    return jsonify({"ok":True,"msg":"备份文件将由机器人发送给你"})
+
 @app.route('/api/member_monitors/<path:cid>', methods=['DELETE'])
 @need_auth
 def api_del_member_monitor(uid, cid):