整理代码

app/router/notification/message.py

@@ -1,10 +1,5 @@
 from __future__ import annotations
 
-import json
-import uuid
-from datetime import datetime
-from typing import Optional
-
 from app.database import ChatMessageResp
 from app.database.chat import (
     ChannelType,
@@ -16,14 +11,13 @@ from app.database.chat import (
     UserSilenceResp,
 )
 from app.database.lazer_user import User
-from app.dependencies.database import Database, get_redis, get_redis_message
+from app.dependencies.database import Database, get_redis
 from app.dependencies.param import BodyOrForm
 from app.dependencies.user import get_current_user
+from app.log import logger
 from app.models.notification import ChannelMessage, ChannelMessageTeam
 from app.router.v2 import api_v2_router as router
-from app.service.optimized_message import optimized_message_service
 from app.service.redis_message_system import redis_message_system
-from app.log import logger
 
 from .banchobot import bot
 from .server import server
@@ -106,11 +100,9 @@ async def send_message(
         ).first()
     else:
         db_channel = (
-            await session.exec(
-                select(ChatChannel).where(ChatChannel.name == channel)
-            )
+            await session.exec(select(ChatChannel).where(ChatChannel.name == channel))
         ).first()
-    
+
     if db_channel is None:
         raise HTTPException(status_code=404, detail="Channel not found")
 
@@ -118,29 +110,29 @@ async def send_message(
     channel_id = db_channel.channel_id
     channel_type = db_channel.type
     channel_name = db_channel.name
-    
+
     assert channel_id is not None
     assert current_user.id
-    
+
     # 使用 Redis 消息系统发送消息 - 立即返回
     resp = await redis_message_system.send_message(
         channel_id=channel_id,
         user=current_user,
         content=req.message,
         is_action=req.is_action,
-        user_uuid=req.uuid
+        user_uuid=req.uuid,
     )
-    
+
     # 立即广播消息给所有客户端
     is_bot_command = req.message.startswith("!")
     await server.send_message_to_channel(
         resp, is_bot_command and channel_type == ChannelType.PUBLIC
     )
-    
+
     # 处理机器人命令
     if is_bot_command:
         await bot.try_handle(current_user, db_channel, req.message, session)
-    
+
     # 为通知系统创建临时 ChatMessage 对象（仅适用于私聊和团队频道）
     if channel_type in [ChannelType.PM, ChannelType.TEAM]:
         temp_msg = ChatMessage(
@@ -151,7 +143,7 @@ async def send_message(
             type=MessageType.ACTION if req.is_action else MessageType.PLAIN,
             uuid=req.uuid,
         )
-        
+
         if channel_type == ChannelType.PM:
             user_ids = channel_name.split("_")[1:]
             await server.new_private_notification(
@@ -163,7 +155,7 @@ async def send_message(
             await server.new_private_notification(
                 ChannelMessageTeam.init(temp_msg, current_user)
             )
-    
+
     return resp
 
 
@@ -191,11 +183,9 @@ async def get_message(
         ).first()
     else:
         db_channel = (
-            await session.exec(
-                select(ChatChannel).where(ChatChannel.name == channel)
-            )
+            await session.exec(select(ChatChannel).where(ChatChannel.name == channel))
         ).first()
-    
+
     if db_channel is None:
         raise HTTPException(status_code=404, detail="Channel not found")
 
@@ -218,7 +208,7 @@ async def get_message(
         query = query.where(col(ChatMessage.message_id) > since)
     if until is not None:
         query = query.where(col(ChatMessage.message_id) < until)
-    
+
     query = query.order_by(col(ChatMessage.message_id).desc()).limit(limit)
     messages = (await session.exec(query)).all()
     resp = [await ChatMessageResp.from_db(msg, session) for msg in messages]
@@ -247,14 +237,12 @@ async def mark_as_read(
         ).first()
     else:
         db_channel = (
-            await session.exec(
-                select(ChatChannel).where(ChatChannel.name == channel)
-            )
+            await session.exec(select(ChatChannel).where(ChatChannel.name == channel))
         ).first()
-    
+
     if db_channel is None:
         raise HTTPException(status_code=404, detail="Channel not found")
-    
+
     # 立即提取需要的属性
     channel_id = db_channel.channel_id
     assert channel_id