fix(avatar): prevent takeover loops and isolate settings

digital-avatar-app/backend/routers/takeover.py

@@ -8,13 +8,25 @@ from sqlalchemy.orm import Session
 from database import get_db
 from models import TakeoverCursor, TakeoverReplyTask, User
 from responses import fail, ok
-from routers.authorizations import _require_authorization
+from routers.authorizations import (
+    DEFAULT_TAKEOVER_DELAY_SECONDS,
+    MAX_TAKEOVER_DELAY_SECONDS,
+    MIN_TAKEOVER_DELAY_SECONDS,
+    _require_authorization,
+    _stored_takeover_delay,
+)
 from routers.avatars import _require_owned_avatar
 
 router = APIRouter(tags=["分身接管"])
 BOXIM_STATUS_FRESH_SECONDS = 60
 
 
+def _delay_label(seconds: int) -> str:
+    if seconds % 60 == 0:
+        return f"{seconds // 60} 分钟"
+    return f"{seconds} 秒"
+
+
 @router.get("/avatar/{avatar_id}/takeover/status")
 def get_takeover_status(
     avatar_id: str,
@@ -24,6 +36,7 @@ def get_takeover_status(
     avatar = _require_owned_avatar(db, avatar_id, authorization)
     permissions = (avatar.config or {}).get("authorizationPermissions", [])
     enabled = isinstance(permissions, list) and "takeover" in permissions
+    reply_delay_seconds = _stored_takeover_delay(avatar)
     user = db.query(User).filter(User.huihui_user_id == avatar.owner_id).first()
     cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar.id).first()
     pending_count = (
@@ -49,7 +62,10 @@ def get_takeover_status(
         and cursor.last_polled_at
         >= datetime.utcnow() - timedelta(seconds=BOXIM_STATUS_FRESH_SECONDS)
     ):
-        status, message = "ready", "BOXIM 已连接，收到私聊消息 3 秒后自动回复"
+        status, message = (
+            "ready",
+            f"BOXIM 已连接，收到私聊消息 {_delay_label(reply_delay_seconds)}后自动回复",
+        )
     else:
         status, message = "connecting", "正在连接 BOXIM"
 
@@ -59,6 +75,7 @@ def get_takeover_status(
             "status": status,
             "message": message,
             "pendingCount": pending_count,
+            "takeoverReplyDelaySeconds": reply_delay_seconds,
             "lastPolledAt": cursor.last_polled_at.isoformat() if cursor and cursor.last_polled_at else None,
         }
     )
@@ -91,7 +108,7 @@ def update_takeover_config(
     auth = _require_authorization(db, avatar_id, str(auth_id))
     enabled = bool(auth.takeover_enabled)
     mode = auth.takeover_mode or "immediate"
-    delay = auth.takeover_delay_seconds or 30
+    delay = auth.takeover_delay_seconds or DEFAULT_TAKEOVER_DELAY_SECONDS
 
     if _has(payload, "takeoverEnabled", "takeover_enabled"):
         raw_enabled = _read(payload, "takeoverEnabled", "takeover_enabled")
@@ -106,8 +123,12 @@ def update_takeover_config(
 
     if _has(payload, "takeoverDelaySeconds", "takeover_delay_seconds"):
         delay = _read(payload, "takeoverDelaySeconds", "takeover_delay_seconds")
-        if isinstance(delay, bool) or not isinstance(delay, int) or not 5 <= delay <= 3600:
-            return fail("延迟时间需在 5 到 3600 秒之间", 400)
+        if (
+            isinstance(delay, bool)
+            or not isinstance(delay, int)
+            or not MIN_TAKEOVER_DELAY_SECONDS <= delay <= MAX_TAKEOVER_DELAY_SECONDS
+        ):
+            return fail("延迟时间需在 3 秒到 24 小时之间", 400)
 
     if enabled and auth.target_type != "user":
         return fail("本期仅支持对会会用户开启单聊接管", 400)