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

🐛 修复qqguild错误的身份组

Browse Source
This commit is contained in:
Wuyi无疑 2023-03-31 01:26:47 +08:00
parent 187a69154e
commit 52e66b243a
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
GenshinUID/__init__.py
View File

@ -1,4 +1,4 @@
from typing import List, Literal, Optional from typing import Any, List, Literal, Optional
from nonebot.log import logger from nonebot.log import logger
from nonebot.adapters import Bot from nonebot.adapters import Bot
@ -31,6 +31,7 @@ async def send_char_adv(bot: Bot, ev: Event):
user_id = str(ev.get_user_id()) user_id = str(ev.get_user_id())
messages = ev.get_message() messages = ev.get_message()
raw_data = ev.__dict__ raw_data = ev.__dict__
logger.debug(raw_data)
group_id = sessions[-2] if len(sessions) >= 2 else None group_id = sessions[-2] if len(sessions) >= 2 else None
self_id = str(bot.self_id) self_id = str(bot.self_id)
message: List[Message] = [] message: List[Message] = []
@ -50,7 +51,7 @@ async def send_char_adv(bot: Bot, ev: Event):
else: else:
group_id = str(raw_data['channel_id']) group_id = str(raw_data['channel_id'])
msg_id = raw_data['id'] msg_id = raw_data['id']
if 4 in raw_data['roles'] or 2 in raw_data['roles']: if 4 in raw_data['member'].roles or 2 in raw_data['member'].roles:
pm = 2 pm = 2
# telegram # telegram
elif 'telegram_model' in raw_data: elif 'telegram_model' in raw_data:
@ -138,21 +139,8 @@ async def send_char_adv(bot: Bot, ev: Event):
# 处理消息 # 处理消息
for _msg in messages: for _msg in messages:
if _msg.type == 'text': message = convert_message(_msg, message)
message.append(
Message(
'text',
_msg.data['text'].replace('/', '')
if 'text' in _msg.data
else _msg.data['content'].replace('/', ''),
)
)
elif _msg.type == 'image':
message.append(Message('image', _msg.data['url']))
elif _msg.type == 'at':
message.append(Message('at', _msg.data['qq']))
elif _msg.type == 'reply':
message.append(Message('reply', _msg.data['id']))
if not message: if not message:
return return
@ -201,3 +189,22 @@ async def connect():
await gsclient.start() await gsclient.start()
except ConnectionRefusedError: except ConnectionRefusedError:
logger.error('Core服务器连接失败...请稍后使用[启动core]命令启动...') logger.error('Core服务器连接失败...请稍后使用[启动core]命令启动...')
def convert_message(_msg: Any, message: List[Message]):
if _msg.type == 'text':
message.append(
Message(
'text',
_msg.data['text'].replace('/', '')
if 'text' in _msg.data
else _msg.data['content'].replace('/', ''),
)
)
elif _msg.type == 'image':
message.append(Message('image', _msg.data['url']))
elif _msg.type == 'at':
message.append(Message('at', _msg.data['qq']))
elif _msg.type == 'reply':
message.append(Message('reply', _msg.data['id']))
return message