Merge pull request #9 from nuist-engineer-lion:dev

feat: 根据成员可用时间段筛选候选人，并在提醒时随机 @ 当前可接单的人

Author: YoungUsing

main.py

@@ -2,6 +2,8 @@
 import asyncio
 import logging
 import statistics
+import random
+from datetime import datetime
 from collections import deque
 from typing import Any, TypedDict
 
@@ -11,13 +13,14 @@
     FriendRequestEvent,
     GroupMsgEmojiLikeEvent,
     FriendPokeEvent,
-    GroupMessageEvent, 
-    GroupPokeEvent, 
+    GroupMessageEvent,
+    GroupPokeEvent,
     Message,
     NodeInline,
     NodeReference,
     Reply,
     Text,
+    At,
 )
 
 # ================= 日志配置 =================
@@ -40,7 +43,7 @@
 # ================= 程序启动时间 =================
 STARTED_AT = time.time()
 
-# 防抖间隔（秒），可按需调整或分别为每种指令设置不同值
+# 防抖间隔（秒）
 DEBOUNCE_SECONDS = {
     "say": 5,
     "more": 5,
@@ -49,16 +52,97 @@
 # 好友申请去重缓存（flag -> 处理时间戳）
 PROCESSED_FRIEND_REQUESTS_EXPIRE = 60  # 缓存保留 60 秒
 
+# ================= 成员可用时间段配置 =================
+# 格式：{ QQ号: { 星期几英文: [(开始时间, 结束时间), ...] } }
+# 星期几可用 "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"
+AVAILABILITY: dict[int, dict[str, list[tuple[str, str]]]] = {
+    234666220: {  # yjx
+        "monday": [("00:00", "11:59"), ("12:00", "23:59")],
+        "tuesday": [],
+        "wednesday": [],
+        "thursday": [],
+        "friday": [],
+        "saturday": [],
+        "sunday": [],
+    },
+    1284656930: {  # cz
+        "monday": [],
+        "tuesday": [("00:00", "11:59"), ("12:00", "23:59")],
+        "wednesday": [],
+        "thursday": [],
+        "friday": [],
+        "saturday": [],
+        "sunday": [],
+    },
+    3499737435: {  # hyn
+        "monday": [],
+        "tuesday": [],
+        "wednesday": [("00:00", "11:59"), ("12:00", "23:59")],
+        "thursday": [],
+        "friday": [],
+        "saturday": [],
+        "sunday": [],
+    },
+    3525362286: {  # djh
+        "monday": [],
+        "tuesday": [],
+        "wednesday": [],
+        "thursday": [("00:00", "11:59"), ("12:00", "23:59")],
+        "friday": [],
+        "saturday": [],
+        "sunday": [],
+    },
+    1372438873: {  # ljh
+        "monday": [],
+        "tuesday": [],
+        "wednesday": [],
+        "thursday": [],
+        "friday": [("00:00", "11:59"), ("12:00", "23:59")],
+        "saturday": [],
+        "sunday": [],
+    },
+    3026425376: {  # pwy
+        "monday": [],
+        "tuesday": [],
+        "wednesday": [],
+        "thursday": [],
+        "friday": [],
+        "saturday": [("00:00", "11:59"), ("12:00", "23:59")],
+        "sunday": [],
+    },
+    2018160654: {  # yyx
+        "monday": [],
+        "tuesday": [],
+        "wednesday": [],
+        "thursday": [],
+        "friday": [],
+        "saturday": [],
+        "sunday": [("00:00", "11:59"), ("12:00", "23:59")],
+    }
+}
+
+# 星期几数字到英文的映射（datetime.weekday() 返回 0=周一, 6=周日）
+WEEKDAY_MAP = {
+    0: "monday",
+    1: "tuesday",
+    2: "wednesday",
+    3: "thursday",
+    4: "friday",
+    5: "saturday",
+    6: "sunday",
+}
+# =================================================
+
 # ================= 回复耗时记录（秒） =================
-REPLY_DURATION_MAXLEN = 1000  # 保留最近 N 次回复耗时，防止列表无限增长
+REPLY_DURATION_MAXLEN = 1000  # 保留最近 N 次回复耗时
 reply_durations: deque[float] = deque(maxlen=REPLY_DURATION_MAXLEN)
 
 class CustomerData(TypedDict):
     last_active: float
     msg_ids: list[int]
     is_newly_reported: bool
     reported_milestones: set[int]
-    pending_since: float           # 本轮开始等待回复的时间戳
+    pending_since: float  # 本轮开始等待回复的时间戳
 
 
 class ForwardMonitorData(TypedDict):
@@ -70,8 +154,8 @@ class ForwardMonitorData(TypedDict):
 unreplied_customers: dict[int, CustomerData] = {}
 monitored_forward_order: deque[int] = deque()
 monitored_forwards: dict[int, ForwardMonitorData] = {}
-last_command_time: dict[tuple[int, str], float] = {} # 记录每条消息上各指令的最后执行时间，键为 (message_id, command_type)
-processed_friend_requests: dict[str, float] = {} # 好友申请去重缓存（flag -> 处理时间戳）
+last_command_time: dict[tuple[int, str], float] = {}  # 记录每条消息上各指令的最后执行时间
+processed_friend_requests: dict[str, float] = {}  # 好友申请去重缓存
 
 # 客户端对象
 client: NapCatClient = NapCatClient(WS_URL, WS_TOKEN)
@@ -121,9 +205,10 @@ def pop_tracked_forward(message_id: int) -> ForwardMonitorData | None:
 
     return data
 
+
 # ================= 格式化时长 =================
 def format_duration(seconds: float) -> str:
-    """将秒数转换为易读的文本（如 3分12秒、1小时05分）"""
+    """将秒数转换为易读的文本"""
     if seconds < 60:
         return f"{int(seconds)}秒"
     elif seconds < 3600:
@@ -228,11 +313,6 @@ async def send_nested_forward(group_id: int, customer_list: list[tuple[int, Cust
 
     log.info("开始构造合并转发 -> 群 %d, 共 %d 名客户", group_id, len(customer_list))
     outer_nodes: list[Message] = [
-        NodeInline(
-            nickname="客服系统提示",
-            user_id=str(client.self_id),
-            content=serialize_message_segments([Text(text=summary_text)]),
-        ),
         NodeInline(
             nickname="快捷传送门",
             user_id=str(client.self_id),
@@ -270,6 +350,62 @@ async def send_nested_forward(group_id: int, customer_list: list[tuple[int, Cust
         log.error("发送合并转发失败: %s", e, exc_info=True)
         return None
 
+
+# ================= 新增：获取当前可用成员 =================
+def get_current_available_members() -> list[int]:
+    """根据当前系统时间，返回所有可用的成员QQ列表"""
+    now = datetime.now()
+    weekday_name = WEEKDAY_MAP[now.weekday()]
+    current_time = now.time()
+
+    available: list[int] = []   # 明确类型为整数列表
+    for qq, schedule in AVAILABILITY.items():
+        time_slots = schedule.get(weekday_name, [])
+        for start_str, end_str in time_slots:
+            try:
+                start = datetime.strptime(start_str, "%H:%M").time()
+                end = datetime.strptime(end_str, "%H:%M").time()
+                if start <= current_time <= end:
+                    available.append(qq)   # 现在类型检查器知道 qq 是 int
+                    break
+            except Exception as e:
+                log.error("解析时间段失败: qq=%s, slot=%s-%s, err=%s", qq, start_str, end_str, e)
+                continue
+    return available
+
+
+# ================= 新增：发送带 @ 的提醒 =================
+async def send_reminder_with_at(group_id: int, summary: str, customer_list: list[tuple[int, CustomerData]]) -> int | None:
+    """
+    发送提醒：先尝试 @ 一位当前可用成员，再发送合并转发。
+    若无可用成员，则直接发送合并转发（无 @）。
+    """
+    available = get_current_available_members()
+    if available:
+        chosen = random.choice(available)
+        # 构造 @ 消息，使用库提供的消息段类
+        at_msg: list[Message] = [
+            At(qq=str(chosen)),          # 假设 At 接受 qq 参数
+            Text(text=f" {summary}"),
+        ]
+        try:
+            await client.send_group_msg(group_id=str(group_id), message=at_msg)
+            log.info("已发送 @%d 提醒: %s", chosen, summary)
+        except Exception as e:
+            log.error("发送 @ 提醒失败: %s", e, exc_info=True)
+    else:
+        log.debug("当前无可用成员，直接发送合并转发")
+
+    # 发送合并转发
+    message_id = await send_nested_forward(group_id, customer_list, summary)
+    if message_id is not None:
+        track_forward_message(
+            message_id=message_id,
+            customer_ids=[qq for qq, _ in customer_list],
+            group_id=group_id,
+        )
+    return message_id
+
 # ================= 核心逻辑：定时巡检任务 =================
 async def monitor_loop():
     """每分钟执行一次的巡检死循环"""
@@ -326,13 +462,8 @@ async def monitor_loop():
 
             # 只通报新触发的客户，避免每次都全量刷屏
             summary = f"📢 刚刚有 {len(new_customers_to_report)} 名客户发来消息，请及时回复！"
-            message_id = await send_nested_forward(INTERNAL_GROUP_ID, new_customers_to_report, summary)
-            if message_id is not None:
-                track_forward_message(
-                    message_id=message_id,
-                    customer_ids=[qq for qq, _ in new_customers_to_report],
-                    group_id=INTERNAL_GROUP_ID,
-                )
+            # 替换为带 @ 的提醒
+            await send_reminder_with_at(INTERNAL_GROUP_ID, summary, new_customers_to_report)
         else:
             log.debug("阶段1: 无新客户需要通报")
 
@@ -364,13 +495,8 @@ async def monitor_loop():
                 log.warning("阶段2: 里程碑 %s 触发, 涉及 %d 名客户: %s",
                             unit, len(delay_list), [qq for qq, _ in delay_list])
                 summary = f"⚠️ 以下 {len(delay_list)} 名客户已等待长达 {unit}！"
-                message_id = await send_nested_forward(INTERNAL_GROUP_ID, delay_list, summary)
-                if message_id is not None:
-                    track_forward_message(
-                        message_id=message_id,
-                        customer_ids=[qq for qq, _ in delay_list],
-                        group_id=INTERNAL_GROUP_ID,
-                    )
+                # 替换为带 @ 的提醒
+                await send_reminder_with_at(INTERNAL_GROUP_ID, summary, delay_list)
 
         log.info("===== 巡检结束 =====")
 
@@ -452,9 +578,8 @@ async def main():
             log.debug("收到事件: type=%s, post_type=%s", type(event).__name__, getattr(event, 'post_type', '?'))
             match event:
                 # 0. 自动通过好友申请
-                case FriendRequestEvent(user_id=uid, comment=comment,flag=flag):
-                    log.info("收到好友申请："+str(uid)+" "+comment)
-                    # 去重检查：如果同一个 flag 在短时间内已处理过，则跳过
+                case FriendRequestEvent(user_id=uid, comment=comment, flag=flag):
+                    log.info("收到好友申请：" + str(uid) + " " + comment)
                     now = time.time()
                     last_time = processed_friend_requests.get(flag)
                     if last_time and (now - last_time) < PROCESSED_FRIEND_REQUESTS_EXPIRE:
@@ -559,7 +684,6 @@ async def main():
                     if closed:
                         log.info("私聊戳一戳结束会话: user_id=%s", sid)
                     else:
-                        # 客户不在队列中，但已发送结束语
                         log.info("私聊戳一戳自动发送结束语（客户不在队列）: user_id=%s", sid)
 
                 # 5. 内部群戳一戳 -> 发送状态面板