Add member monitoring and edit APIs

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
+from telethon import TelegramClient, events
 from telethon.sessions import StringSession
 from telethon.extensions import html as tl_html
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
@@ -1282,6 +1282,22 @@ 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():
+            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)
+
     async def update_channel_msg():
         current_time = int(time.time()); data_changed = False
         for uid, u_data in DATA.get("users", {}).items():
@@ -1566,6 +1582,19 @@ def api_add_group(uid):
     DATA["users"][uid].setdefault("groups",[]).append({"name":d.get("name",""),"src":d["src"],"tgt":[t for t in tgt if t]})
     save_data(); return jsonify({"ok":True,"user":DATA["users"][uid]})
 
+@app.route('/api/groups/<int:idx>', methods=['PUT'])
+@need_auth
+def api_edit_group(uid, idx):
+    d = request.json or {}; tgt = d.get("tgt", [])
+    if isinstance(tgt, str): tgt = [tgt]
+    targets = [str(t).strip() for t in tgt if str(t).strip()]
+    if not str(d.get("src", "")).strip() or not targets:
+        return jsonify({"ok":False,"msg":"来源频道和目标频道不能为空"})
+    try:
+        DATA["users"][uid]["groups"][idx] = {"name":str(d.get("name", "")).strip(), "src":str(d["src"]).strip(), "tgt":targets}
+        save_data(); return jsonify({"ok":True,"user":DATA["users"][uid]})
+    except (IndexError, KeyError): return jsonify({"ok":False,"msg":"索引无效"})
+
 @app.route('/api/groups/<int:idx>', methods=['DELETE'])
 @need_auth
 def api_del_group(uid, idx):
@@ -1578,6 +1607,18 @@ def api_add_channel(uid):
     d = request.json; DATA["users"][uid].setdefault("address_book",{})[d["id"]]=d["name"]; save_data()
     return jsonify({"ok":True,"user":DATA["users"][uid]})
 
+@app.route('/api/channels/<path:cid>', methods=['PUT'])
+@need_auth
+def api_edit_channel(uid, cid):
+    d = request.json or {}; new_id = str(d.get("id", "")).strip(); name = str(d.get("name", "")).strip()
+    if not new_id or not name: return jsonify({"ok":False,"msg":"频道 ID 和备注不能为空"})
+    ab = DATA["users"][uid].setdefault("address_book", {})
+    if cid not in ab: return jsonify({"ok":False,"msg":"频道不存在"})
+    if new_id != cid and new_id in ab: return jsonify({"ok":False,"msg":"新频道 ID 已存在"})
+    if new_id != cid: del ab[cid]
+    ab[new_id] = name; save_data()
+    return jsonify({"ok":True,"user":DATA["users"][uid]})
+
 @app.route('/api/channels/<path:cid>', methods=['DELETE'])
 @need_auth
 def api_del_channel(uid, cid):
@@ -1862,15 +1903,24 @@ def api_backup(uid):
         return jsonify({"ok":True})
     except Exception as e: return jsonify({"ok":False,"msg":str(e)})
 
-# ===== 🆕 备份频道成员 =====
-@app.route('/api/backup_members', methods=['POST'])
+# ===== 频道成员入群监控 =====
+@app.route('/api/member_monitors', methods=['POST'])
 @need_auth
-def api_backup_members(uid):
-    d = request.json
+def api_add_member_monitor(uid):
+    d = request.json or {}
     ch_id = d.get('ch_id','').strip()
     if not ch_id: return jsonify({"ok":False,"msg":"请输入频道ID"})
-    Thread(target=run_backup_members, args=(uid, ch_id)).start()
-    return jsonify({"ok":True})
+    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":[]})
+    save_data(); return jsonify({"ok":True,"user":DATA["users"][uid]})
+
+@app.route('/api/member_monitors/<path:cid>', methods=['DELETE'])
+@need_auth
+def api_del_member_monitor(uid, cid):
+    monitors = DATA["users"][uid].setdefault("member_monitors", [])
+    DATA["users"][uid]["member_monitors"] = [m for m in monitors if str(m.get("channel_id")) != cid]
+    save_data(); return jsonify({"ok":True,"user":DATA["users"][uid]})
 
 # ===== 批量建频道 =====
 def run_batch_create_channels(uid, channel_names, user_ids, count=1):