feat(命令): 重构机器人消息处理并添加静音/解除静音命令，包括更新忽略文件、优化消息格式和错误处理、实现静音和解除静音命令以及增强命令处理逻辑

.gitignore

@@ -1,4 +1,4 @@
-test.py
+*test*
 __pycache__
 .env
 .venv

APP/bot_utils.py

@@ -32,30 +32,23 @@ def call_ai_stream_api(api_url, model, messages, api_key):
         logging.error(f"AI API 请求失败: {e}")
         raise
 
-def send_bot_message(bot, chat_id, text, reply_to_message_id=None, parse_mode='MarkdownV2', reply_markup=None):
+def send_bot_message(bot, chat_id, message, parse_mode='MarkdownV2', disable_web_page_preview=None):
     try:
-        sent_message = bot.send_message(
-            chat_id, 
-            text, 
-            reply_to_message_id=reply_to_message_id, 
-            parse_mode=parse_mode, 
-            reply_markup=reply_markup
-        )
-        if sent_message and hasattr(sent_message, 'message_id'):
-            add_message_to_delete_queue(chat_id, sent_message.message_id)
-            logging.info(f"消息已发送到聊天 {chat_id}")
-            return sent_message
+        if parse_mode == "HTML":
+            sent_message = bot.send_message(chat_id, message, parse_mode="HTML", disable_web_page_preview=disable_web_page_preview)
+        elif parse_mode == "MarkdownV2":
+            escaped_message = telegramify_markdown.markdownify(message)
+            sent_message = bot.send_message(chat_id, escaped_message, parse_mode='MarkdownV2', disable_web_page_preview=disable_web_page_preview)
         else:
-            logging.error(f"发送消息到聊天 {chat_id} 失败: 无效的响应格式")
-            return None
+            sent_message = bot.send_message(chat_id, message, disable_web_page_preview=disable_web_page_preview)
+        return sent_message
     except ApiTelegramException as e:
-        if e.error_code == 400 and "chat not found" in e.description:
-            logging.warning(f"聊天 {chat_id} 未找到")
-        else:
-            logging.error(f"发送消息到聊天 {chat_id} 失败: {e}")
+        error_message = str(e)
+        logging.error(f"发送消息到聊天 {chat_id} 失败: {error_message}")
+        bot.send_message(chat_id, f"错误: {error_message}", parse_mode='MarkdownV2')
     except Exception as e:
         logging.error(f"发送消息到聊天 {chat_id} 失败: {e}")
-    return None
+        bot.send_message(chat_id, f"错误: {e}", parse_mode='MarkdownV2')
 
 def edit_bot_message(bot, chat_id, message_id, text, parse_mode='MarkdownV2'):
     try:

APP/commands.py

@@ -2,6 +2,7 @@ import logging
 import datetime
 import json
 import random
+import re
 import time
 import telegramify_markdown
 from telebot import types
@@ -154,4 +155,155 @@ def handle_reset_db_command(message: types.Message, bot, thread_local):
 
     sent_message = bot.send_message(chat_id, f"请点击下方正确的验证码以确认操作：\n**正确验证码：{correct_code}**", reply_markup=markup, parse_mode="MarkdownV2")
 
-    thread_local.verification_codes = {user_id: {"code": correct_code, "timestamp": time.time()}}
+    thread_local.verification_codes = {user_id: {"code": correct_code, "timestamp": time.time()}}
+
+def handle_mute_command(message: types.Message, bot, thread_local):
+    chat_id = message.chat.id
+    user_id = message.from_user.id
+
+    if chat_id < 0 and not is_group_admin(chat_id, user_id, message, bot):
+        send_bot_message(bot, chat_id, "你并非管理员,故无权限", parse_mode="MarkdownV2")
+        logging.warning(f"用户 {user_id} 尝试禁言用户，但无权限")
+        return
+
+    args = message.text.split()[1:]
+    target_user = None
+    time_str = None
+    reason = None
+
+    if message.reply_to_message:
+        target_user = message.reply_to_message.from_user
+        if args:
+            time_str = args[0]
+            reason = " ".join(args[1:])
+    elif len(args) >= 2:
+        user_str, time_str, *reason_parts = args
+        reason = " ".join(reason_parts)
+        try:
+            target_user = bot.get_chat_member(chat_id, user_str.lstrip('@')).user
+        except Exception:
+            send_bot_message(bot, chat_id, "无法找到用户", parse_mode="MarkdownV2")
+            logging.warning(f"禁言用户时发生错误: 无法找到用户")
+            return
+    else:
+        send_bot_message(bot, chat_id, "请使用正确的格式: `.mute [user] [time] [reason]` 或引用消息", parse_mode="MarkdownV2")
+        return
+    
+    if not target_user:
+        send_bot_message(bot, chat_id, "请使用正确的格式: `.mute [user] [time] [reason]` 或引用消息", parse_mode="MarkdownV2")
+        return
+
+    try:
+        mute_duration = parse_duration(time_str)
+    except ValueError:
+        send_bot_message(bot, chat_id, "时间格式不正确", parse_mode="MarkdownV2")
+        return
+    except Exception as e:
+        send_bot_message(bot, chat_id, f"解析时间失败: {e}", parse_mode="MarkdownV2")
+        logging.warning(f"解析时间失败: {e}")
+        return
+
+    until_date = datetime.datetime.now() + datetime.timedelta(seconds=mute_duration) if mute_duration >= 30 else None
+    
+    try:
+        bot.restrict_chat_member(chat_id, target_user.id, permissions=types.ChatPermissions(can_send_messages=False), until_date=until_date)
+    except Exception as e:
+        send_bot_message(bot, chat_id, f"禁言用户失败: {e}", parse_mode="MarkdownV2")
+        logging.warning(f"禁言用户失败: {e}")
+        return
+    
+    formatted_time = str(datetime.timedelta(seconds=mute_duration)) if mute_duration else "永久"
+    admin_username = message.from_user.username or message.from_user.first_name
+    
+    mute_message = (
+        "<b>禁言通知</b>\n\n"
+        f"被禁言用户: @{target_user.username or target_user.first_name}\n"
+        f"操作管理员: @{admin_username}\n"
+        f"禁言时长: <code>{formatted_time}</code>\n"
+    )
+    if reason:
+        mute_message += f"理由: <code>{reason}</code>\n"
+    if until_date:
+        mute_message += f"解除时间: <code>{until_date.strftime('%Y-%m-%d %H:%M:%S')}</code>"
+    
+    send_bot_message(bot, chat_id, mute_message, parse_mode="HTML")
+    logging.info(f"用户 {user_id} 禁言用户 {target_user.id}，时长 {time_str}，原因: {reason}")
+
+
+def handle_unmute_command(message: types.Message, bot, thread_local):
+    chat_id = message.chat.id
+    user_id = message.from_user.id
+
+    if chat_id < 0 and not is_group_admin(chat_id, user_id, message, bot):
+        send_bot_message(bot, chat_id, "你并非管理员,故无权限", parse_mode="MarkdownV2")
+        logging.warning(f"用户 {user_id} 尝试解禁用户，但无权限")
+        return
+
+    args = message.text.split()[1:]
+    target_user = None
+    reason = None
+
+    if message.reply_to_message:
+        target_user = message.reply_to_message.from_user
+        reason = " ".join(args)
+    elif args:
+        user_str, *reason_parts = args
+        reason = " ".join(reason_parts)
+        try:
+            target_user = bot.get_chat_member(chat_id, user_str.lstrip('@')).user
+        except Exception:
+            send_bot_message(bot, chat_id, "无法找到用户", parse_mode="MarkdownV2")
+            logging.warning(f"解禁用户时发生错误: 无法找到用户")
+            return
+    else:
+        send_bot_message(bot, chat_id, "请使用正确的格式: `.unmute [user] [reason]` 或引用消息", parse_mode="MarkdownV2")
+        return
+    
+    if not target_user:
+        send_bot_message(bot, chat_id, "请使用正确的���式: `.unmute [user] [reason]` 或引用消息", parse_mode="MarkdownV2")
+        return
+
+    try:
+        bot.restrict_chat_member(chat_id, target_user.id, permissions=types.ChatPermissions(can_send_messages=True))
+    except Exception as e:
+        send_bot_message(bot, chat_id, f"解禁用户失败: {e}", parse_mode="MarkdownV2")
+        logging.warning(f"解禁用户失败: {e}")
+        return
+    
+    admin_username = message.from_user.username or message.from_user.first_name
+    unmute_message = (
+        "<b>解除禁言通知</b>\n\n"
+        f"被解禁用户: @{target_user.username or target_user.first_name}\n"
+        f"操作管理员: @{admin_username}\n"
+    )
+    if reason:
+        unmute_message += f"理由: <code>{reason}</code>"
+    send_bot_message(bot, chat_id, unmute_message, parse_mode="HTML")
+    logging.info(f"用户 {user_id} 解禁用户 {target_user.id}，原因: {reason}")
+
+def parse_duration(duration_str):
+    if not duration_str:
+        return None
+
+    duration_str = duration_str.lower()
+    total_seconds = 0
+    
+    pattern = re.compile(r'(\d+)([smhd])')
+    
+    for match in pattern.finditer(duration_str):
+        value, unit = match.groups()
+        value = int(value)
+        
+        if unit == 's':
+            total_seconds += value
+        elif unit == 'm':
+            total_seconds += value * 60
+        elif unit == 'h':
+            total_seconds += value * 3600
+        elif unit == 'd':
+            total_seconds += value * 86400
+    
+    if not total_seconds and duration_str:
+         raise ValueError("无效的时间单位")
+
+    return total_seconds

APP/handlers.py

@@ -71,7 +71,7 @@ def handle_model_selection(call: types.CallbackQuery, bot, thread_local):
 def handle_reset_db_verification(call: types.CallbackQuery, bot, thread_local):
     user_id = call.from_user.id
     chat_id = call.message.chat.id
-    selected_code = call.data.replace("resetdb_verify_", "")  # 确保解析逻辑与 callback_data 格式一致
+    selected_code = call.data.replace("resetdb_verify_", "")
     user_code_data = getattr(thread_local, 'verification_codes', {}).get(user_id)
 
     if not user_code_data:

APP/webhook.py

@@ -5,8 +5,8 @@ from handlers import (
     handle_model_page_navigation, handle_reset_db_verification,
 )
 from commands import (
-    handle_set_command, handle_clear_command, handle_reset_db_command,
-    handle_json_command, handle_id_command
+    handle_mute_command, handle_set_command, handle_clear_command, handle_reset_db_command,
+    handle_json_command, handle_id_command, handle_unmute_command
 )
 import logging
 
@@ -21,7 +21,9 @@ async def telegram_webhook(request: Request, token: str, bot, thread_local):
     try:
         body = await request.json()
         update = telebot.types.Update.de_json(body)
-
+        
+        bot_username = bot.get_me().username
+        
         if update.callback_query:
             callback_query = update.callback_query
             if callback_query.data.startswith('resetdb_verify_'):
@@ -33,7 +35,7 @@ async def telegram_webhook(request: Request, token: str, bot, thread_local):
 
         elif update.message:
             message = update.message
-            if should_process_message(message, bot):
+            if should_process_message(message, bot, bot_username):
                 if message.text and message.text.startswith('.set'):
                     handle_set_command(message, bot, thread_local)
                 elif message.text and message.text.startswith('.clear'):
@@ -44,6 +46,10 @@ async def telegram_webhook(request: Request, token: str, bot, thread_local):
                     handle_json_command(message, bot)
                 elif message.text and message.text.startswith('.id'):
                     handle_id_command(message, bot)
+                elif message.text and message.text.startswith('.mute'):
+                    handle_mute_command(message, bot, thread_local)
+                elif message.text and message.text.startswith('.unmute'):
+                    handle_unmute_command(message, bot, thread_local)
                 else:
                     handle_message(message, bot, thread_local)
 
@@ -54,13 +60,12 @@ async def telegram_webhook(request: Request, token: str, bot, thread_local):
         logging.error(f"Webhook 处理失败: {e}", exc_info=True)
         return Response(status_code=500)
 
-def should_process_message(message: telebot.types.Message, bot):
-    direct_commands = [".set", ".clear", ".resetdb", ".json", ".id"]
+def should_process_message(message: telebot.types.Message, bot, bot_username):
+    direct_commands = [".set", ".clear", ".resetdb", ".json", ".id", ".mute", ".unmute"]
 
     if message.chat.type == 'private':
         return True
     elif message.chat.type in ['group', 'supergroup']:
-        bot_username = bot.get_me().username
         if message.reply_to_message and message.reply_to_message.from_user.id == bot.get_me().id:
             return True
         elif message.text: