feat: 新增跨平台消息互通插件及适配器优化
refactor(discord_adapter): 优化音频处理与心跳机制 feat(plugins/discord-cross): 实现QQ与Discord消息互通功能 fix(events/base): 添加platform字段到基础事件模型
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
4. 将插件返回的 OneBot `MessageSegment` 转换为 Discord 格式并发送。
|
||||
"""
|
||||
import asyncio
|
||||
from typing import Union, List, Any, Optional
|
||||
from typing import Union, List, Any, Optional, Dict
|
||||
|
||||
try:
|
||||
import discord
|
||||
@@ -27,6 +27,189 @@ from core.utils.logger import ModuleLogger
|
||||
|
||||
logger = ModuleLogger("EventRouter")
|
||||
|
||||
class DiscordBotWrapper:
|
||||
"""
|
||||
包装 DiscordAdapter，提供与 OneBot 相同的发送接口。
|
||||
"""
|
||||
def __init__(self, adapter: Any):
|
||||
self.adapter = adapter
|
||||
self.self_id = adapter.user.id if adapter.user else 0
|
||||
|
||||
async def send_group_msg(self, group_id: int, message: Union[str, OneBotMessageSegment, List[OneBotMessageSegment]], auto_escape: bool = False):
|
||||
channel = self.adapter.get_channel(group_id)
|
||||
if not channel:
|
||||
logger.error(f"Discord channel {group_id} not found")
|
||||
return
|
||||
await DiscordToOneBotConverter.send_discord_message(channel, message, self.adapter)
|
||||
|
||||
async def send_private_msg(self, user_id: int, message: Union[str, OneBotMessageSegment, List[OneBotMessageSegment]], auto_escape: bool = False):
|
||||
user = self.adapter.get_user(user_id)
|
||||
if not user:
|
||||
logger.error(f"Discord user {user_id} not found")
|
||||
return
|
||||
if not user.dm_channel:
|
||||
await user.create_dm()
|
||||
await DiscordToOneBotConverter.send_discord_message(user.dm_channel, message, self.adapter)
|
||||
|
||||
async def send(self, event, message, **kwargs):
|
||||
if isinstance(event, GroupMessageEvent):
|
||||
await self.send_group_msg(event.group_id, message)
|
||||
elif isinstance(event, PrivateMessageEvent):
|
||||
await self.send_private_msg(event.user_id, message)
|
||||
|
||||
def build_forward_node(self, user_id: int, nickname: str, message: Union[str, OneBotMessageSegment, List[OneBotMessageSegment]]) -> Dict[str, Any]:
|
||||
"""
|
||||
构建一个用于合并转发的消息节点 (Node)。
|
||||
"""
|
||||
processed_message = message
|
||||
if isinstance(message, OneBotMessageSegment):
|
||||
processed_message = [{"type": message.type, "data": message.data}]
|
||||
elif isinstance(message, list):
|
||||
processed_message = [{"type": seg.type, "data": seg.data} if isinstance(seg, OneBotMessageSegment) else seg for seg in message]
|
||||
|
||||
return {
|
||||
"type": "node",
|
||||
"data": {
|
||||
"uin": user_id,
|
||||
"name": nickname,
|
||||
"content": processed_message
|
||||
}
|
||||
}
|
||||
|
||||
async def send_forwarded_messages(self, target, nodes):
|
||||
"""
|
||||
模拟发送合并转发消息。
|
||||
Discord 不支持像 QQ 那样的合并转发，所以我们将其转换为普通消息发送。
|
||||
"""
|
||||
content = ""
|
||||
files = []
|
||||
|
||||
for node in nodes:
|
||||
if node.get("type") == "node":
|
||||
node_data = node.get("data", {})
|
||||
node_content = node_data.get("content", [])
|
||||
|
||||
if isinstance(node_content, str):
|
||||
import re
|
||||
cq_pattern = r'\[CQ:([^,]+)(?:,([^\]]+))?\]'
|
||||
matches = list(re.finditer(cq_pattern, node_content))
|
||||
|
||||
if not matches:
|
||||
content += f"{node_content}\n"
|
||||
else:
|
||||
last_end = 0
|
||||
for match in matches:
|
||||
if match.start() > last_end:
|
||||
content += node_content[last_end:match.start()]
|
||||
|
||||
cq_type = match.group(1)
|
||||
cq_params_str = match.group(2) or ""
|
||||
|
||||
params = {}
|
||||
if cq_params_str:
|
||||
for param in cq_params_str.split(','):
|
||||
if '=' in param:
|
||||
k, v = param.split('=', 1)
|
||||
params[k] = v
|
||||
|
||||
if cq_type in ("image", "video", "record"):
|
||||
file_url = params.get("url") or params.get("file")
|
||||
if file_url:
|
||||
if str(file_url).startswith("http"):
|
||||
content += f"\n{file_url}\n"
|
||||
elif str(file_url).startswith("base64://"):
|
||||
import base64
|
||||
import io
|
||||
b64_data = str(file_url)[9:]
|
||||
if b64_data.startswith("data:image") or b64_data.startswith("data:audio") or b64_data.startswith("data:video"):
|
||||
b64_data = b64_data.split(",", 1)[1]
|
||||
try:
|
||||
file_bytes = base64.b64decode(b64_data)
|
||||
filename = "file.png" if cq_type == "image" else ("file.mp4" if cq_type == "video" else "file.ogg")
|
||||
files.append(discord.File(fp=io.BytesIO(file_bytes), filename=filename))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 Base64 文件失败: {e}")
|
||||
else:
|
||||
try:
|
||||
files.append(discord.File(file_url))
|
||||
except Exception as e:
|
||||
logger.error(f"无法读取本地文件 {file_url}: {e}")
|
||||
elif cq_type == "face":
|
||||
# QQ 表情，简单转为文本
|
||||
face_id = params.get("id")
|
||||
content += f"[表情:{face_id}]"
|
||||
elif cq_type == "at":
|
||||
qq_id = params.get("qq")
|
||||
if qq_id == "all":
|
||||
content += "@everyone "
|
||||
else:
|
||||
content += f"<@{qq_id}> "
|
||||
|
||||
last_end = match.end()
|
||||
|
||||
if last_end < len(node_content):
|
||||
content += node_content[last_end:]
|
||||
content += "\n"
|
||||
elif isinstance(node_content, list):
|
||||
for seg in node_content:
|
||||
if isinstance(seg, dict):
|
||||
seg_type = seg.get("type")
|
||||
seg_data = seg.get("data", {})
|
||||
|
||||
if seg_type == "text":
|
||||
content += seg_data.get("text", "")
|
||||
elif seg_type in ("image", "video", "record"):
|
||||
file_url = seg_data.get("url") or seg_data.get("file")
|
||||
if file_url:
|
||||
if isinstance(file_url, bytes):
|
||||
import io
|
||||
try:
|
||||
filename = "file.png" if seg_type == "image" else ("file.mp4" if seg_type == "video" else "file.ogg")
|
||||
files.append(discord.File(fp=io.BytesIO(file_url), filename=filename))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 bytes 文件失败: {e}")
|
||||
elif str(file_url).startswith("http"):
|
||||
content += f"\n{file_url}\n"
|
||||
elif str(file_url).startswith("base64://") or "data:image" in str(file_url) or "data:audio" in str(file_url) or "data:video" in str(file_url):
|
||||
import base64
|
||||
import io
|
||||
b64_data = str(file_url)
|
||||
if b64_data.startswith("base64://"):
|
||||
b64_data = b64_data[9:]
|
||||
if b64_data.startswith("data:image") or b64_data.startswith("data:audio") or b64_data.startswith("data:video"):
|
||||
b64_data = b64_data.split(",", 1)[1]
|
||||
try:
|
||||
file_bytes = base64.b64decode(b64_data)
|
||||
filename = "file.png" if seg_type == "image" else ("file.mp4" if seg_type == "video" else "file.ogg")
|
||||
files.append(discord.File(fp=io.BytesIO(file_bytes), filename=filename))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 Base64 文件失败: {e}")
|
||||
else:
|
||||
try:
|
||||
files.append(discord.File(file_url))
|
||||
except Exception as e:
|
||||
logger.error(f"无法读取本地文件 {file_url}: {e}")
|
||||
elif seg_type == "face":
|
||||
face_id = seg_data.get("id")
|
||||
content += f"[表情:{face_id}]"
|
||||
content += "\n"
|
||||
|
||||
try:
|
||||
if content or files:
|
||||
# target is usually event, we can use event.bot.send
|
||||
if isinstance(target, GroupMessageEvent):
|
||||
channel = self.adapter.get_channel(target.group_id)
|
||||
if channel:
|
||||
await channel.send(content=content, files=files if files else None)
|
||||
elif isinstance(target, PrivateMessageEvent):
|
||||
user = self.adapter.get_user(target.user_id)
|
||||
if user:
|
||||
if not user.dm_channel:
|
||||
await user.create_dm()
|
||||
await user.dm_channel.send(content=content, files=files if files else None)
|
||||
except Exception as e:
|
||||
logger.error(f"发送 Discord 合并转发消息失败: {e}")
|
||||
|
||||
class DiscordToOneBotConverter:
|
||||
"""
|
||||
将 Discord 消息转换为 OneBot 消息事件的转换器。
|
||||
@@ -53,13 +236,85 @@ class DiscordToOneBotConverter:
|
||||
# 我们需要把前面的 @ 提及去掉，否则命令匹配器 (matcher) 无法识别以 "/" 开头的命令
|
||||
raw_message = discord_message.content
|
||||
|
||||
# 添加附件信息到 raw_message
|
||||
# 构造 message 列表 (将文本和附件转换为 MessageSegment)
|
||||
message_list = []
|
||||
|
||||
# 添加文本内容
|
||||
if discord_message.content:
|
||||
# 处理 Discord 自定义表情 <:name:id> 或 <a:name:id>
|
||||
import re
|
||||
content = discord_message.content
|
||||
|
||||
# 查找所有自定义表情
|
||||
emoji_pattern = r'<a?:([^:]+):(\d+)>'
|
||||
|
||||
# 如果有表情，我们需要将文本分割成多个片段
|
||||
if re.search(emoji_pattern, content):
|
||||
last_end = 0
|
||||
for match in re.finditer(emoji_pattern, content):
|
||||
# 添加表情前的文本
|
||||
if match.start() > last_end:
|
||||
text_part = content[last_end:match.start()]
|
||||
if text_part:
|
||||
message_list.append(OneBotMessageSegment.text(text_part))
|
||||
|
||||
# 添加表情作为图片
|
||||
emoji_name = match.group(1)
|
||||
emoji_id = match.group(2)
|
||||
is_animated = match.group(0).startswith('<a:')
|
||||
ext = 'gif' if is_animated else 'png'
|
||||
emoji_url = f"https://cdn.discordapp.com/emojis/{emoji_id}.{ext}"
|
||||
|
||||
seg = OneBotMessageSegment.image(emoji_url)
|
||||
seg.data["filename"] = f"{emoji_name}.{ext}"
|
||||
message_list.append(seg)
|
||||
|
||||
last_end = match.end()
|
||||
|
||||
# 添加剩余的文本
|
||||
if last_end < len(content):
|
||||
text_part = content[last_end:]
|
||||
if text_part:
|
||||
message_list.append(OneBotMessageSegment.text(text_part))
|
||||
else:
|
||||
message_list.append(OneBotMessageSegment.text(content))
|
||||
|
||||
# 添加附件信息
|
||||
if discord_message.attachments:
|
||||
for attachment in discord_message.attachments:
|
||||
raw_message += f"\n{attachment.url}"
|
||||
filename = attachment.filename.lower()
|
||||
# 检查是否是语音文件
|
||||
if filename.endswith(('.amr', '.silk', '.mp3', '.wav', '.ogg', '.m4a')):
|
||||
seg = OneBotMessageSegment.record(attachment.url)
|
||||
seg.data["filename"] = attachment.filename
|
||||
message_list.append(seg)
|
||||
raw_message += f"\n[语音: {attachment.filename}]"
|
||||
elif filename.endswith(('.mp4', '.avi', '.mkv', '.mov', '.flv', '.wmv')):
|
||||
seg = OneBotMessageSegment.video(attachment.url)
|
||||
seg.data["filename"] = attachment.filename
|
||||
message_list.append(seg)
|
||||
raw_message += f"\n[视频: {attachment.filename}]"
|
||||
else:
|
||||
seg = OneBotMessageSegment.image(attachment.url)
|
||||
seg.data["filename"] = attachment.filename
|
||||
message_list.append(seg)
|
||||
raw_message += f"\n[图片: {attachment.filename}]"
|
||||
|
||||
# 添加贴纸 (Stickers) 信息
|
||||
if hasattr(discord_message, 'stickers') and discord_message.stickers:
|
||||
for sticker in discord_message.stickers:
|
||||
seg = OneBotMessageSegment.image(sticker.url)
|
||||
seg.data["filename"] = f"{sticker.name}.png"
|
||||
message_list.append(seg)
|
||||
raw_message += f"\n[贴纸: {sticker.name}]"
|
||||
bot_mention = f"<@{adapter.user.id}>"
|
||||
if raw_message.startswith(bot_mention):
|
||||
raw_message = raw_message[len(bot_mention):].strip()
|
||||
# 如果 message_list 的第一个元素是文本，也需要去掉 @ 提及
|
||||
if message_list and message_list[0].type == "text":
|
||||
text_content = message_list[0].data.get("text", "")
|
||||
if text_content.startswith(bot_mention):
|
||||
message_list[0].data["text"] = text_content[len(bot_mention):].strip()
|
||||
|
||||
# 构造发送者信息
|
||||
sender = Sender(
|
||||
@@ -72,9 +327,6 @@ class DiscordToOneBotConverter:
|
||||
# 2. 判断是群聊还是私聊
|
||||
is_private = isinstance(discord_message.channel, discord.DMChannel)
|
||||
|
||||
# 构造 message 列表 (将纯文本转换为 MessageSegment)
|
||||
message_list = [OneBotMessageSegment.text(raw_message)]
|
||||
|
||||
import time
|
||||
current_time = int(time.time())
|
||||
self_id = adapter.user.id if adapter.user else 0
|
||||
@@ -89,6 +341,7 @@ class DiscordToOneBotConverter:
|
||||
event = PrivateMessageEvent(
|
||||
time=current_time,
|
||||
self_id=self_id,
|
||||
platform="discord",
|
||||
message_type="private",
|
||||
sub_type="friend",
|
||||
message_id=message_id,
|
||||
@@ -103,6 +356,7 @@ class DiscordToOneBotConverter:
|
||||
event = GroupMessageEvent(
|
||||
time=current_time,
|
||||
self_id=self_id,
|
||||
platform="discord",
|
||||
message_type="group",
|
||||
sub_type="normal",
|
||||
message_id=message_id,
|
||||
@@ -119,146 +373,14 @@ class DiscordToOneBotConverter:
|
||||
event.discord_username = discord_username
|
||||
event.discord_discriminator = discord_discriminator
|
||||
|
||||
# 3. 拦截并重写 reply 方法 (核心魔法)
|
||||
# 插件调用 event.reply() 时，实际上会执行这个闭包
|
||||
async def mock_reply(message: Union[str, OneBotMessageSegment, List[OneBotMessageSegment]], auto_escape: bool = False):
|
||||
await DiscordToOneBotConverter.send_discord_reply(discord_message, message, adapter)
|
||||
|
||||
# 覆盖实例方法
|
||||
event.reply = mock_reply
|
||||
|
||||
# 注入一个假的 bot 对象，防止插件调用 event.bot.xxx 时报错
|
||||
# 这里只提供最基础的属性，如果插件调用了复杂的 API，可能会报错
|
||||
class MockBot:
|
||||
def __init__(self):
|
||||
self.self_id = adapter.user.id if adapter.user else 0
|
||||
|
||||
async def send(self, event, message, **kwargs):
|
||||
await DiscordToOneBotConverter.send_discord_reply(discord_message, message, adapter)
|
||||
|
||||
async def send_forwarded_messages(self, target, nodes):
|
||||
"""
|
||||
模拟发送合并转发消息。
|
||||
Discord 不支持像 QQ 那样的合并转发，所以我们将其转换为普通消息发送。
|
||||
"""
|
||||
content = ""
|
||||
files = []
|
||||
|
||||
for node in nodes:
|
||||
if node.get("type") == "node":
|
||||
node_data = node.get("data", {})
|
||||
node_content = node_data.get("content", [])
|
||||
|
||||
# 提取节点中的文本和图片
|
||||
if isinstance(node_content, str):
|
||||
# 尝试解析 CQ 码
|
||||
import re
|
||||
cq_pattern = r'\[CQ:([^,]+)(?:,([^\]]+))?\]'
|
||||
matches = list(re.finditer(cq_pattern, node_content))
|
||||
|
||||
if not matches:
|
||||
content += f"{node_content}\n"
|
||||
else:
|
||||
last_end = 0
|
||||
for match in matches:
|
||||
if match.start() > last_end:
|
||||
content += node_content[last_end:match.start()]
|
||||
|
||||
cq_type = match.group(1)
|
||||
cq_params_str = match.group(2) or ""
|
||||
|
||||
params = {}
|
||||
if cq_params_str:
|
||||
for param in cq_params_str.split(','):
|
||||
if '=' in param:
|
||||
k, v = param.split('=', 1)
|
||||
params[k] = v
|
||||
|
||||
if cq_type in ("image", "video"):
|
||||
file_url = params.get("url") or params.get("file")
|
||||
if file_url:
|
||||
if str(file_url).startswith("http"):
|
||||
content += f"\n{file_url}\n"
|
||||
elif str(file_url).startswith("base64://"):
|
||||
import base64
|
||||
import io
|
||||
b64_data = str(file_url)[9:]
|
||||
if b64_data.startswith("data:image"):
|
||||
b64_data = b64_data.split(",", 1)[1]
|
||||
try:
|
||||
image_bytes = base64.b64decode(b64_data)
|
||||
files.append(discord.File(fp=io.BytesIO(image_bytes), filename="image.png"))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 Base64 图片失败: {e}")
|
||||
else:
|
||||
try:
|
||||
files.append(discord.File(file_url))
|
||||
except Exception as e:
|
||||
logger.error(f"无法读取本地文件 {file_url}: {e}")
|
||||
elif cq_type == "at":
|
||||
qq_id = params.get("qq")
|
||||
if qq_id == "all":
|
||||
content += "@everyone "
|
||||
else:
|
||||
content += f"<@{qq_id}> "
|
||||
|
||||
last_end = match.end()
|
||||
|
||||
if last_end < len(node_content):
|
||||
content += node_content[last_end:]
|
||||
content += "\n"
|
||||
elif isinstance(node_content, list):
|
||||
for seg in node_content:
|
||||
if isinstance(seg, dict):
|
||||
seg_type = seg.get("type")
|
||||
seg_data = seg.get("data", {})
|
||||
|
||||
if seg_type == "text":
|
||||
content += seg_data.get("text", "")
|
||||
elif seg_type == "image" or seg_type == "video":
|
||||
file_url = seg_data.get("url") or seg_data.get("file")
|
||||
if file_url:
|
||||
if isinstance(file_url, bytes):
|
||||
import io
|
||||
try:
|
||||
files.append(discord.File(fp=io.BytesIO(file_url), filename="image.png"))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 bytes 图片失败: {e}")
|
||||
elif str(file_url).startswith("http"):
|
||||
content += f"\n{file_url}\n"
|
||||
elif str(file_url).startswith("base64://") or "data:image" in str(file_url):
|
||||
import base64
|
||||
import io
|
||||
b64_data = str(file_url)
|
||||
if b64_data.startswith("base64://"):
|
||||
b64_data = b64_data[9:]
|
||||
if b64_data.startswith("data:image"):
|
||||
b64_data = b64_data.split(",", 1)[1]
|
||||
try:
|
||||
image_bytes = base64.b64decode(b64_data)
|
||||
files.append(discord.File(fp=io.BytesIO(image_bytes), filename="image.png"))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 Base64 图片失败: {e}")
|
||||
else:
|
||||
try:
|
||||
files.append(discord.File(file_url))
|
||||
except Exception as e:
|
||||
logger.error(f"无法读取本地文件 {file_url}: {e}")
|
||||
content += "\n"
|
||||
|
||||
try:
|
||||
if content or files:
|
||||
await discord_message.channel.send(content=content, files=files if files else None)
|
||||
except Exception as e:
|
||||
logger.error(f"发送 Discord 合并转发消息失败: {e}")
|
||||
|
||||
event.bot = MockBot()
|
||||
# 注入 DiscordBotWrapper
|
||||
event.bot = DiscordBotWrapper(adapter)
|
||||
|
||||
return event
|
||||
|
||||
@staticmethod
|
||||
async def send_discord_reply(
|
||||
original_message: 'discord.Message',
|
||||
async def send_discord_message(
|
||||
channel: 'discord.abc.Messageable',
|
||||
message: Union[str, OneBotMessageSegment, List[OneBotMessageSegment]],
|
||||
adapter: Any
|
||||
):
|
||||
@@ -266,7 +388,7 @@ class DiscordToOneBotConverter:
|
||||
将 OneBot 的消息段转换为 Discord 格式并发送。
|
||||
|
||||
Args:
|
||||
original_message: 触发此回复的原始 Discord 消息
|
||||
channel: Discord 频道对象 (TextChannel, DMChannel 等)
|
||||
message: 插件返回的 OneBot 消息内容 (字符串或 MessageSegment 列表)
|
||||
adapter: DiscordAdapter 实例
|
||||
"""
|
||||
@@ -306,29 +428,33 @@ class DiscordToOneBotConverter:
|
||||
k, v = param.split('=', 1)
|
||||
params[k] = v
|
||||
|
||||
if cq_type in ("image", "video"):
|
||||
if cq_type in ("image", "video", "record"):
|
||||
file_url = params.get("url") or params.get("file")
|
||||
if file_url:
|
||||
if str(file_url).startswith("http"):
|
||||
content += f"\n{file_url}"
|
||||
elif str(file_url).startswith("base64://") or "data:image" in str(file_url):
|
||||
elif str(file_url).startswith("base64://") or "data:image" in str(file_url) or "data:audio" in str(file_url) or "data:video" in str(file_url):
|
||||
import base64
|
||||
import io
|
||||
b64_data = str(file_url)
|
||||
if b64_data.startswith("base64://"):
|
||||
b64_data = b64_data[9:]
|
||||
if b64_data.startswith("data:image"):
|
||||
if b64_data.startswith("data:image") or b64_data.startswith("data:audio") or b64_data.startswith("data:video"):
|
||||
b64_data = b64_data.split(",", 1)[1]
|
||||
try:
|
||||
image_bytes = base64.b64decode(b64_data)
|
||||
files.append(discord.File(fp=io.BytesIO(image_bytes), filename="image.png"))
|
||||
file_bytes = base64.b64decode(b64_data)
|
||||
filename = "file.png" if cq_type == "image" else ("file.mp4" if cq_type == "video" else "file.ogg")
|
||||
files.append(discord.File(fp=io.BytesIO(file_bytes), filename=filename))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 Base64 图片失败: {e}")
|
||||
logger.error(f"解析 Base64 文件失败: {e}")
|
||||
else:
|
||||
try:
|
||||
files.append(discord.File(file_url))
|
||||
except Exception as e:
|
||||
logger.error(f"无法读取本地文件 {file_url}: {e}")
|
||||
elif cq_type == "face":
|
||||
face_id = params.get("id")
|
||||
content += f"[表情:{face_id}]"
|
||||
elif cq_type == "at":
|
||||
qq_id = params.get("qq")
|
||||
if qq_id == "all":
|
||||
@@ -349,8 +475,8 @@ class DiscordToOneBotConverter:
|
||||
|
||||
if seg_type == "text":
|
||||
content += seg_data.get("text", "")
|
||||
elif seg_type == "image" or seg_type == "video":
|
||||
# OneBot 的图片/视频通常有 file (URL或本地路径) 或 url 字段
|
||||
elif seg_type in ("image", "video", "record"):
|
||||
# OneBot 的图片/视频/语音通常有 file (URL或本地路径) 或 url 字段
|
||||
file_url = seg_data.get("url") or seg_data.get("file")
|
||||
|
||||
if file_url:
|
||||
@@ -358,32 +484,37 @@ class DiscordToOneBotConverter:
|
||||
if isinstance(file_url, bytes):
|
||||
import io
|
||||
try:
|
||||
files.append(discord.File(fp=io.BytesIO(file_url), filename="image.png"))
|
||||
filename = "file.png" if seg_type == "image" else ("file.mp4" if seg_type == "video" else "file.ogg")
|
||||
files.append(discord.File(fp=io.BytesIO(file_url), filename=filename))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 bytes 图片失败: {e}")
|
||||
logger.error(f"解析 bytes 文件失败: {e}")
|
||||
elif str(file_url).startswith("http"):
|
||||
# 如果是网络 URL，直接拼接到文本中，Discord 会自动解析预览
|
||||
content += f"\n{file_url}"
|
||||
elif str(file_url).startswith("base64://") or "data:image" in str(file_url):
|
||||
# 处理 Base64 图片 (需要解码并作为文件上传)
|
||||
elif str(file_url).startswith("base64://") or "data:image" in str(file_url) or "data:audio" in str(file_url) or "data:video" in str(file_url):
|
||||
# 处理 Base64 文件 (需要解码并作为文件上传)
|
||||
import base64
|
||||
import io
|
||||
b64_data = str(file_url)
|
||||
if b64_data.startswith("base64://"):
|
||||
b64_data = b64_data[9:]
|
||||
if b64_data.startswith("data:image"):
|
||||
if b64_data.startswith("data:image") or b64_data.startswith("data:audio") or b64_data.startswith("data:video"):
|
||||
b64_data = b64_data.split(",", 1)[1]
|
||||
try:
|
||||
image_bytes = base64.b64decode(b64_data)
|
||||
files.append(discord.File(fp=io.BytesIO(image_bytes), filename="image.png"))
|
||||
file_bytes = base64.b64decode(b64_data)
|
||||
filename = "file.png" if seg_type == "image" else ("file.mp4" if seg_type == "video" else "file.ogg")
|
||||
files.append(discord.File(fp=io.BytesIO(file_bytes), filename=filename))
|
||||
except Exception as e:
|
||||
logger.error(f"解析 Base64 图片失败: {e}")
|
||||
logger.error(f"解析 Base64 文件失败: {e}")
|
||||
else:
|
||||
# 假设是本地文件路径
|
||||
try:
|
||||
files.append(discord.File(file_url))
|
||||
except Exception as e:
|
||||
logger.error(f"无法读取本地文件 {file_url}: {e}")
|
||||
elif seg_type == "face":
|
||||
face_id = seg_data.get("id")
|
||||
content += f"[表情:{face_id}]"
|
||||
elif seg_type == "at":
|
||||
qq_id = seg_data.get("qq")
|
||||
if qq_id == "all":
|
||||
@@ -399,7 +530,7 @@ class DiscordToOneBotConverter:
|
||||
try:
|
||||
# 如果内容为空但有文件，Discord 允许发送
|
||||
if content or files:
|
||||
await original_message.channel.send(content=content, files=files if files else None)
|
||||
await channel.send(content=content, files=files if files else None)
|
||||
else:
|
||||
logger.warning("尝试发送空消息到 Discord，已拦截")
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user