feat(翻译): 改进翻译功能,同时显示原文和译文

修改翻译功能,不再替换原文而是同时显示原文和翻译内容,方便用户对照
更新 DeepSeek API 配置为官方地址和模型
优化 Discord 适配器的重连逻辑,直接关闭 WebSocket 触发重连
修复 Discord 频道 ID 转换逻辑,简化处理流程
This commit is contained in:
2026-03-22 15:07:18 +08:00
parent e34221939e
commit 313c4c651b
3 changed files with 20 additions and 11 deletions

View File

@@ -193,6 +193,11 @@ class DiscordAdapter(discord.Client if DISCORD_AVAILABLE else object):
self.logger.info(f"[DiscordAdapter] 正在发送消息到频道 {channel_id}") self.logger.info(f"[DiscordAdapter] 正在发送消息到频道 {channel_id}")
else: else:
self.logger.error(f"[DiscordAdapter] 会话已关闭,无法发送消息到频道 {channel_id}") self.logger.error(f"[DiscordAdapter] 会话已关闭,无法发送消息到频道 {channel_id}")
# 触发重连
self.logger.warning(f"[DiscordAdapter] 会话已关闭,将触发重连")
if self.ws is not None:
# 关闭 WebSocket 连接,让 discord.py 自动重连
await self.ws.close(4000)
return return
embed = None embed = None
@@ -284,9 +289,8 @@ class DiscordAdapter(discord.Client if DISCORD_AVAILABLE else object):
# 如果发送失败,尝试检查会话状态 # 如果发送失败,尝试检查会话状态
if self.is_closed(): if self.is_closed():
self.logger.warning(f"[DiscordAdapter] 会话已关闭,将触发重连") self.logger.warning(f"[DiscordAdapter] 会话已关闭,将触发重连")
await self.close() if self.ws is not None:
# 重新启动客户端 await self.ws.close(4000)
asyncio.create_task(self.start_client())
raise raise
else: else:
self.logger.debug(f"[DiscordAdapter] 没有内容需要发送到频道 {channel_id}") self.logger.debug(f"[DiscordAdapter] 没有内容需要发送到频道 {channel_id}")
@@ -325,6 +329,8 @@ class DiscordAdapter(discord.Client if DISCORD_AVAILABLE else object):
self.logger.info(f"将在 {retry_delay} 秒后重连 ({retry_count}/{max_retries if max_retries != -1 else '无限'})...") self.logger.info(f"将在 {retry_delay} 秒后重连 ({retry_count}/{max_retries if max_retries != -1 else '无限'})...")
# 清理旧的连接状态 # 清理旧的连接状态
if hasattr(self, 'http') and self.http:
await self.http.close()
self.clear() self.clear()
await asyncio.sleep(retry_delay) await asyncio.sleep(retry_delay)
@@ -347,7 +353,7 @@ class DiscordAdapter(discord.Client if DISCORD_AVAILABLE else object):
# 我们可以通过检查 self.is_closed() 或者 ws.open 来判断 # 我们可以通过检查 self.is_closed() 或者 ws.open 来判断
if self.ws is not None and not getattr(self.ws, 'open', True): if self.ws is not None and not getattr(self.ws, 'open', True):
self.logger.warning("检测到 WebSocket 连接已关闭,触发重连...") self.logger.warning("检测到 WebSocket 连接已关闭,触发重连...")
await self.close() await self.ws.close(4000)
break break
self.logger.debug(f"心跳正常: {self.user}") self.logger.debug(f"心跳正常: {self.user}")

View File

@@ -16,9 +16,9 @@ class CrossPlatformConfig:
self.ENABLE_CROSS_PLATFORM = True self.ENABLE_CROSS_PLATFORM = True
# DeepSeek API 配置 # DeepSeek API 配置
self.DEEPSEEK_API_KEY = "sk-Cn4BeHyTHDPRKuDadLy6dUnjSSHxrz5wQa54ZFAdQovXguLD" self.DEEPSEEK_API_KEY = "sk-7b824b05e85445f8a9ceef6c849388a9"
self.DEEPSEEK_API_URL = "https://api.gptgod.online/v1/chat/completions" self.DEEPSEEK_API_URL = "https://api.deepseek.com/v1/chat/completions"
self.DEEPSEEK_MODEL = "gemini-3-flash-preview" self.DEEPSEEK_MODEL = "deepseek-chat"
# 是否启用翻译功能 # 是否启用翻译功能
self.ENABLE_TRANSLATION = True self.ENABLE_TRANSLATION = True
@@ -48,12 +48,14 @@ class CrossPlatformConfig:
for key, value in mappings.items(): for key, value in mappings.items():
if isinstance(value, dict) and "qq_group_id" in value: if isinstance(value, dict) and "qq_group_id" in value:
try: try:
discord_id = int(key) if str(key).isdigit() else int(str(key).split('.')[-1]) # 直接将 key 转换为整数
discord_id = int(str(key))
self.CROSS_PLATFORM_MAP[discord_id] = { self.CROSS_PLATFORM_MAP[discord_id] = {
"qq_group_id": int(value.get("qq_group_id", 0)), "qq_group_id": int(value.get("qq_group_id", 0)),
"name": value.get("name", "") "name": value.get("name", "")
} }
except (ValueError, AttributeError): except (ValueError, AttributeError):
logger.warning(f"[CrossPlatform] 无效的 Discord 频道 ID: {key}")
continue continue
logger.success(f"[CrossPlatform] 配置已重新加载: {len(self.CROSS_PLATFORM_MAP)} 个映射") logger.success(f"[CrossPlatform] 配置已重新加载: {len(self.CROSS_PLATFORM_MAP)} 个映射")

View File

@@ -125,8 +125,8 @@ async def forward_discord_to_qq(
if text_only: if text_only:
translated_content = await translate_with_deepseek(text_only, "zh-CN", channel_id, "en2zh") translated_content = await translate_with_deepseek(text_only, "zh-CN", channel_id, "en2zh")
if translated_content != text_only: if translated_content != text_only:
# 将翻译后的文本替换回原文本位置 # 同时包含原文和翻译内容
formatted_content = formatted_content.replace(text_only, translated_content) formatted_content = f"{formatted_content}\n\n[翻译]\n{translated_content}"
await send_to_qq(target_qq_group, formatted_content, image_list) await send_to_qq(target_qq_group, formatted_content, image_list)
logger.success(f"[CrossPlatform] Discord 频道 {channel_id} -> QQ 群 {target_qq_group}") logger.success(f"[CrossPlatform] Discord 频道 {channel_id} -> QQ 群 {target_qq_group}")
@@ -166,7 +166,8 @@ async def forward_qq_to_discord(
if text_only: if text_only:
translated_text = await translate_with_deepseek(text_only, "en", group_id, "zh2en") translated_text = await translate_with_deepseek(text_only, "en", group_id, "zh2en")
if translated_text != text_only: if translated_text != text_only:
embed["description"] = embed["description"].replace(text_only, translated_text) # 同时包含原文和翻译内容
embed["description"] = f"{original_text}\n\n[Translation]\n{translated_text}"
for channel_id in target_channels: for channel_id in target_channels:
await send_to_discord(channel_id, formatted_content, image_list, embed) await send_to_discord(channel_id, formatted_content, image_list, embed)