Genshin-bots/GenshinUID
1
0
Fork 0
mirror of https://github.com/KimigaiiWuyi/GenshinUID.git synced 2025-05-12 06:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 修复多余括号

Browse Source
This commit is contained in:
Wuyi无疑 2023-03-05 23:18:15 +08:00
parent f0ef919fb2
commit e0b638bc99
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GenshinUID/client.py
View File

@ -1,5 +1,5 @@
import asyncio
from typing import List, Union, Optional
from typing import Dict, List, Union, Optional
import websockets.client
from nonebot import get_bot
@ -8,7 +8,7 @@ from nonebot.adapters import Bot
from msgspec import json as msgjson
from websockets.exceptions import ConnectionClosedError
from .models import Message, MessageSend, MessageReceive
from .models import MessageSend, MessageReceive
BOT_ID = 'NoneBot2'
@ -109,7 +109,7 @@ async def onebot_send(
bot: Bot,
content: Optional[str],
image: Optional[bytes],
node: Optional[List[Message]],
node: Optional[List[Dict]],
target_id: Optional[str],
target_type: Optional[str],
):
@ -145,19 +145,17 @@ async def onebot_send(
)
if node:
messages = (
[
messages = [
to_json(
f'[CQ:image,file=base64://{_msg.data}]'
if _msg.type == 'image'
else _msg.data,
f'[CQ:image,file=base64://{_msg["data"]}]'
if _msg['type'] == 'image'
else _msg['data'],
'小助手',
2854196310,
)
for _msg in node
if _msg.data
],
)
if 'data' in _msg
]
await _send_node(messages)
else:
await _send(content, image)
@ -167,7 +165,7 @@ async def guild_send(
bot: Bot,
content: Optional[str],
image: Optional[bytes],
node: Optional[List[Message]],
node: Optional[List[Dict]],
target_id: Optional[str],
target_type: Optional[str],
):
@ -186,12 +184,12 @@ async def guild_send(
if node:
for _msg in node:
if _msg.type == 'image':
image = _msg.data
if _msg['type'] == 'image':
image = _msg['data']
content = None
else:
image = None
content = _msg.data
content = _msg['data']
await _send(content, image)
else:
await _send(content, image)
@ -201,7 +199,7 @@ async def ntchat_send(
bot: Bot,
content: Optional[str],
image: Optional[bytes],
node: Optional[List[Message]],
node: Optional[List[Dict]],
target_id: Optional[str],
):
async def _send(content: Optional[str], image: Optional[bytes]):
@ -220,9 +218,9 @@ async def ntchat_send(
if node:
for _msg in node:
if _msg.type == 'image':
await _send(None, _msg.data)
if _msg['type'] == 'image':
await _send(None, _msg['data'])
else:
await _send(_msg.data, None)
await _send(_msg['data'], None)
else:
await _send(content, image)