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

🎨 引入ev.real_bot_id解决同个应用端但不同协议的问题

Browse Source
This commit is contained in:
KimigaiiWuyi 2023-09-22 01:15:51 +08:00
parent e101d942a2
commit 0e54c60b63
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gsuid_core/bot.py
View File

@ -139,7 +139,7 @@ class Bot:
message, message,
self.ev.user_type, self.ev.user_type,
self.ev.group_id if self.ev.group_id else self.ev.user_id, self.ev.group_id if self.ev.group_id else self.ev.user_id,
self.ev.bot_id, self.ev.real_bot_id,
self.bot_self_id, self.bot_self_id,
self.ev.msg_id, self.ev.msg_id,
at_sender, at_sender,
@ -158,7 +158,7 @@ class Bot:
message, message,
target_type, target_type,
target_id, target_id,
self.ev.bot_id, self.ev.real_bot_id,
self.ev.bot_self_id, self.ev.bot_self_id,
self.ev.msg_id, self.ev.msg_id,
at_sender, at_sender,

8
gsuid_core/handler.py
View File

@ -24,14 +24,20 @@ async def get_user_pml(msg: MessageReceive) -> int:
async def msg_process(msg: MessageReceive) -> Event: async def msg_process(msg: MessageReceive) -> Event:
if ':' in msg.bot_id:
bot_id = msg.bot_id.split(':')[0]
else:
bot_id = msg.bot_id
event = Event( event = Event(
msg.bot_id, bot_id,
msg.bot_self_id, msg.bot_self_id,
msg.msg_id, msg.msg_id,
msg.user_type, msg.user_type,
msg.group_id, msg.group_id,
msg.user_id, msg.user_id,
msg.user_pm, msg.user_pm,
real_bot_id=msg.bot_id,
) )
_content: List[Message] = [] _content: List[Message] = []
for _msg in msg.content: for _msg in msg.content:

1
gsuid_core/models.py
View File

@ -20,6 +20,7 @@ class MessageReceive(Struct):
class Event(MessageReceive): class Event(MessageReceive):
real_bot_id: str = ''
raw_text: str = '' raw_text: str = ''
command: str = '' command: str = ''
text: str = '' text: str = ''