mirror of
https://github.com/KimigaiiWuyi/GenshinUID.git
synced 2025-05-12 06:55:58 +08:00
🐛 更标准的ob11合并转发,兼容更多协议端 (#625)
This commit is contained in:
parent
d5a21b560e
commit
5c00eb7e0f
@ -348,10 +348,10 @@ class GsClient:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def to_json(msg: str, name: str, uin: int):
|
def to_json(msg: list, name: str, uin: str):
|
||||||
return {
|
return {
|
||||||
'type': 'node',
|
"type": "node",
|
||||||
'data': {'name': name, 'uin': uin, 'content': msg},
|
"data": {"name": name, "uin": uin, "content": msg},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -685,16 +685,20 @@ async def onebot_send(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if node:
|
if node:
|
||||||
|
from nonebot.adapters.onebot.v11 import MessageSegment
|
||||||
|
|
||||||
messages = [
|
messages = [
|
||||||
to_json(
|
to_json(
|
||||||
f'[CQ:image,file={_msg["data"]}]'
|
[
|
||||||
if _msg['type'] == 'image'
|
MessageSegment.image(_msg["data"])
|
||||||
else _msg['data'],
|
if _msg["type"] == "image"
|
||||||
'小助手',
|
else MessageSegment.text(_msg["data"])
|
||||||
2854196310,
|
],
|
||||||
|
"小助手",
|
||||||
|
str(2854196310),
|
||||||
)
|
)
|
||||||
for _msg in node
|
for _msg in node
|
||||||
if 'data' in _msg
|
if "data" in _msg
|
||||||
]
|
]
|
||||||
await _send_node(messages)
|
await _send_node(messages)
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user