be552a90ea
* fix(discord): 修复 WebSocket 连接检测并增强跨平台文件处理 修复 Discord WebSocket 连接检测逻辑，使用正确的属性检查连接状态 为跨平台消息处理添加文件类型支持，并增加详细的调试日志 优化附件处理逻辑，确保所有文件类型都能正确识别和转发 * feat(跨平台): 优化消息处理并添加纯文本提取功能 添加 extract_text_only 函数过滤非文本标记 修改翻译逻辑仅处理纯文本内容 完善附件处理和消息内容拼接 修复仅包含表情时的消息处理问题 * refactor(discord-cross): 使用模块专用日志记录器替换全局日志记录器 将各模块中的全局日志记录器替换为模块专用日志记录器，以提供更清晰的日志来源标识 同时在适配器中添加会话状态检查和重连机制，提升消息发送的可靠性
188 lines
8.7 KiB
Python
188 lines
8.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""
|
|
跨平台消息互通插件发送器模块
|
|
"""
|
|
import json
|
|
from typing import List
|
|
from core.utils.logger import ModuleLogger
|
|
from core.managers.redis_manager import redis_manager
|
|
from .config import config
|
|
from .translator import translate_with_deepseek
|
|
from .parser import format_discord_to_qq_content, format_qq_to_discord_content, extract_text_only
|
|
|
|
# 创建模块专用日志记录器
|
|
logger = ModuleLogger("CrossPlatformSender")
|
|
|
|
async def send_to_discord(channel_id: int, content: str, attachments: List[dict] = None, embed: dict = None):
|
|
"""发送消息到 Discord 频道"""
|
|
try:
|
|
publish_data = {
|
|
"type": "send_message",
|
|
"channel_id": channel_id,
|
|
"content": content,
|
|
"attachments": attachments or [],
|
|
"embed": embed
|
|
}
|
|
await redis_manager.redis.publish("neobot_discord_send", json.dumps(publish_data))
|
|
logger.info(f"[CrossPlatform] 消息已发布到 Redis 供 Discord 适配器发送: {channel_id}")
|
|
|
|
except Exception as e:
|
|
logger.error(f"[CrossPlatform] 发送消息到 Discord 失败: {e}")
|
|
|
|
async def send_to_qq(group_id: int, content: str, attachments: List[dict] = None):
|
|
"""发送消息到 QQ 群"""
|
|
logger.debug(f"[CrossPlatform] send_to_qq: group_id={group_id}, content='{content}', attachments={attachments}")
|
|
try:
|
|
from core.managers.bot_manager import bot_manager
|
|
from models.message import MessageSegment
|
|
|
|
all_bots = bot_manager.get_all_bots()
|
|
|
|
if not all_bots:
|
|
logger.error(f"[CrossPlatform] 没有可用的 QQ 机器人实例")
|
|
return
|
|
|
|
logger.debug(f"[CrossPlatform] 找到 {len(all_bots)} 个 QQ 机器人实例")
|
|
|
|
for bot in all_bots:
|
|
try:
|
|
message = content
|
|
|
|
if attachments:
|
|
full_message = []
|
|
if content:
|
|
full_message.append(MessageSegment.text(content))
|
|
for attachment in attachments:
|
|
if isinstance(attachment, dict):
|
|
att_type = attachment.get("type", "image")
|
|
attachment_url = attachment.get("url", "")
|
|
|
|
if att_type == "image":
|
|
full_message.append(MessageSegment.image(attachment_url, cache=True, proxy=True, timeout=30))
|
|
elif att_type == "record":
|
|
full_message.append(MessageSegment.record(attachment_url, cache=True, proxy=True, timeout=30))
|
|
elif att_type == "video":
|
|
full_message.append(MessageSegment.video(attachment_url))
|
|
elif att_type == "file":
|
|
full_message.append(MessageSegment.file(attachment_url))
|
|
logger.success(f"[CrossPlatform] 已添加文件到 QQ 消息: {attachment_url}")
|
|
else:
|
|
attachment_url = str(attachment)
|
|
if attachment_url.lower().endswith(('.mp4', '.avi', '.mkv', '.mov', '.flv', '.wmv')):
|
|
full_message.append(MessageSegment.video(attachment_url))
|
|
elif attachment_url.lower().endswith(('.amr', '.silk', '.mp3', '.wav', '.ogg', '.m4a')):
|
|
full_message.append(MessageSegment.record(attachment_url, cache=True, proxy=True, timeout=30))
|
|
elif attachment_url.lower().endswith(('.png', '.jpg', '.jpeg', '.gif', '.webp')):
|
|
image_type = "flash" if attachment_url.lower().endswith('.gif') else None
|
|
full_message.append(MessageSegment.image(attachment_url, cache=True, proxy=True, timeout=30, image_type=image_type))
|
|
else:
|
|
full_message.append(MessageSegment.file(attachment_url))
|
|
logger.success(f"[CrossPlatform] 已添加文件到 QQ 消息 (通过扩展名识别): {attachment_url}")
|
|
|
|
logger.debug(f"[CrossPlatform] 准备发送消息到 QQ 群 {group_id}: {full_message}")
|
|
await bot.send_group_msg(group_id, full_message)
|
|
logger.success(f"[CrossPlatform] 消息已发送到 QQ 群 {group_id}: {full_message}")
|
|
else:
|
|
logger.debug(f"[CrossPlatform] 准备发送纯文本消息到 QQ 群 {group_id}: {message}")
|
|
await bot.send_group_msg(group_id, message)
|
|
logger.success(f"[CrossPlatform] 纯文本消息已发送到 QQ 群 {group_id}: {message}")
|
|
break
|
|
except Exception as e:
|
|
logger.error(f"[CrossPlatform] 发送消息到 QQ 群 {group_id} 失败: {e}")
|
|
|
|
except Exception as e:
|
|
logger.error(f"[CrossPlatform] 发送消息到 QQ 失败: {e}")
|
|
|
|
async def forward_discord_to_qq(
|
|
discord_username: str,
|
|
discord_discriminator: str,
|
|
content: str,
|
|
channel_id: int,
|
|
attachments: List[dict] = None
|
|
):
|
|
"""将 Discord 消息转发到所有映射的 QQ 群"""
|
|
logger.debug(f"[CrossPlatform] forward_discord_to_qq: channel_id={channel_id}, attachments={attachments}")
|
|
if channel_id not in config.CROSS_PLATFORM_MAP:
|
|
logger.warning(f"[CrossPlatform] 未找到 Discord 频道 {channel_id} 的映射配置")
|
|
return
|
|
|
|
group_info = config.CROSS_PLATFORM_MAP[channel_id]
|
|
target_qq_group = group_info["qq_group_id"]
|
|
|
|
formatted_content, image_list = await format_discord_to_qq_content(
|
|
discord_username,
|
|
discord_discriminator,
|
|
content,
|
|
channel_id,
|
|
attachments
|
|
)
|
|
|
|
logger.debug(f"[CrossPlatform] 格式化后的内容: '{formatted_content}', 图片列表: {image_list}")
|
|
|
|
if formatted_content:
|
|
# 只提取文本进行翻译，过滤掉非文本内容
|
|
text_only = extract_text_only(formatted_content)
|
|
if text_only:
|
|
translated_content = await translate_with_deepseek(text_only, "zh-CN", channel_id, "en2zh")
|
|
if translated_content != text_only:
|
|
# 将翻译后的文本替换回原文本位置
|
|
formatted_content = formatted_content.replace(text_only, translated_content)
|
|
|
|
await send_to_qq(target_qq_group, formatted_content, image_list)
|
|
logger.success(f"[CrossPlatform] Discord 频道 {channel_id} -> QQ 群 {target_qq_group}")
|
|
logger.debug(f"[CrossPlatform] send_to_qq 已调用: group_id={target_qq_group}, formatted_content='{formatted_content}', image_list={image_list}")
|
|
|
|
async def forward_qq_to_discord(
|
|
qq_nickname: str,
|
|
qq_user_id: int,
|
|
group_name: str,
|
|
group_id: int,
|
|
content: str,
|
|
attachments: List[dict] = None
|
|
):
|
|
"""将 QQ 消息转发到所有映射的 Discord 频道"""
|
|
target_channels = []
|
|
for discord_channel_id, info in config.CROSS_PLATFORM_MAP.items():
|
|
if info["qq_group_id"] == group_id:
|
|
target_channels.append(discord_channel_id)
|
|
|
|
if not target_channels:
|
|
logger.warning(f"[CrossPlatform] 未找到 QQ 群 {group_id} 的映射配置")
|
|
return
|
|
|
|
formatted_content, image_list, embed = await format_qq_to_discord_content(
|
|
qq_nickname,
|
|
qq_user_id,
|
|
group_name,
|
|
group_id,
|
|
content,
|
|
attachments
|
|
)
|
|
|
|
if embed and embed.get("description"):
|
|
original_text = embed["description"]
|
|
# 只提取文本进行翻译
|
|
text_only = extract_text_only(original_text)
|
|
if text_only:
|
|
translated_text = await translate_with_deepseek(text_only, "en", group_id, "zh2en")
|
|
if translated_text != text_only:
|
|
embed["description"] = embed["description"].replace(text_only, translated_text)
|
|
|
|
for channel_id in target_channels:
|
|
await send_to_discord(channel_id, formatted_content, image_list, embed)
|
|
|
|
logger.success(f"[CrossPlatform] QQ 群 {group_id} -> Discord 频道 {target_channels}")
|
|
|
|
async def publish_to_redis(platform: str, data: dict):
|
|
"""通过 Redis 发布跨平台消息"""
|
|
try:
|
|
if redis_manager.redis:
|
|
publish_data = {
|
|
"platform": platform,
|
|
"data": data,
|
|
"timestamp": int(__import__('time').time())
|
|
}
|
|
await redis_manager.redis.publish(config.CROSS_PLATFORM_CHANNEL, json.dumps(publish_data))
|
|
logger.debug(f"[CrossPlatform] 已通过 Redis 发布消息: platform={platform}")
|
|
except Exception as e:
|
|
logger.error(f"[CrossPlatform] Redis 发布失败: {e}") |