be552a90ea
* fix(discord): 修复 WebSocket 连接检测并增强跨平台文件处理 修复 Discord WebSocket 连接检测逻辑，使用正确的属性检查连接状态 为跨平台消息处理添加文件类型支持，并增加详细的调试日志 优化附件处理逻辑，确保所有文件类型都能正确识别和转发 * feat(跨平台): 优化消息处理并添加纯文本提取功能 添加 extract_text_only 函数过滤非文本标记 修改翻译逻辑仅处理纯文本内容 完善附件处理和消息内容拼接 修复仅包含表情时的消息处理问题 * refactor(discord-cross): 使用模块专用日志记录器替换全局日志记录器 将各模块中的全局日志记录器替换为模块专用日志记录器，以提供更清晰的日志来源标识 同时在适配器中添加会话状态检查和重连机制，提升消息发送的可靠性
84 lines
3.4 KiB
Python
84 lines
3.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""
|
|
跨平台消息互通插件订阅模块
|
|
"""
|
|
import json
|
|
import asyncio
|
|
from core.utils.logger import ModuleLogger
|
|
from core.managers.redis_manager import redis_manager
|
|
from .config import config
|
|
from .sender import forward_discord_to_qq, forward_qq_to_discord
|
|
|
|
# 创建模块专用日志记录器
|
|
logger = ModuleLogger("CrossPlatformSubscription")
|
|
|
|
async def cross_platform_subscription_loop():
|
|
"""Redis 跨平台消息订阅循环"""
|
|
if redis_manager.redis is None:
|
|
logger.warning("[CrossPlatform] Redis 未初始化，无法启动订阅")
|
|
return
|
|
|
|
try:
|
|
pubsub = redis_manager.redis.pubsub()
|
|
await pubsub.subscribe(config.CROSS_PLATFORM_CHANNEL)
|
|
|
|
logger.success("[CrossPlatform] 已订阅 Redis 跨平台频道")
|
|
|
|
async for message in pubsub.listen():
|
|
if message["type"] == "message":
|
|
try:
|
|
data = json.loads(message["data"])
|
|
platform = data.get("platform", "")
|
|
message_data = data.get("data", {})
|
|
|
|
logger.info(f"[CrossPlatform] 收到跨平台消息: {platform}")
|
|
|
|
if platform == "discord":
|
|
await forward_discord_to_qq(
|
|
discord_username=message_data.get("username", "Unknown"),
|
|
discord_discriminator=message_data.get("discriminator", ""),
|
|
content=message_data.get("content", ""),
|
|
channel_id=message_data.get("channel_id", 0),
|
|
attachments=message_data.get("attachments", [])
|
|
)
|
|
elif platform == "qq":
|
|
await forward_qq_to_discord(
|
|
qq_nickname=message_data.get("nickname", "Unknown"),
|
|
qq_user_id=message_data.get("user_id", 0),
|
|
group_name=message_data.get("group_name", ""),
|
|
group_id=message_data.get("group_id", 0),
|
|
content=message_data.get("content", ""),
|
|
attachments=message_data.get("attachments", []),
|
|
embed=message_data.get("embed")
|
|
)
|
|
|
|
except json.JSONDecodeError as e:
|
|
logger.error(f"[CrossPlatform] 解析消息失败: {e}")
|
|
except Exception as e:
|
|
logger.error(f"[CrossPlatform] 处理跨平台消息失败: {e}")
|
|
|
|
except Exception as e:
|
|
logger.error(f"[CrossPlatform] 订阅循环异常: {e}")
|
|
|
|
_subscription_task = None
|
|
|
|
async def start_cross_platform_subscription():
|
|
"""启动跨平台消息订阅"""
|
|
global _subscription_task
|
|
|
|
if _subscription_task is None and config.ENABLE_CROSS_PLATFORM:
|
|
_subscription_task = asyncio.create_task(cross_platform_subscription_loop())
|
|
logger.success("[CrossPlatform] 跨平台消息订阅已启动")
|
|
|
|
async def stop_cross_platform_subscription():
|
|
"""停止跨平台消息订阅"""
|
|
global _subscription_task
|
|
|
|
if _subscription_task:
|
|
_subscription_task.cancel()
|
|
try:
|
|
await _subscription_task
|
|
except asyncio.CancelledError:
|
|
pass
|
|
_subscription_task = None
|
|
logger.info("[CrossPlatform] 跨平台消息订阅已停止") |