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

💥 为消息体增加bot_self_id以适配多账户

Browse Source
This commit is contained in:
Wuyi无疑 2023-03-26 18:57:42 +08:00
parent 9196e894f2
commit d604c0fd25
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gsuid_core/bot.py
View File

@ -24,6 +24,7 @@ class _Bot:
target_type: Literal['group', 'direct', 'channel', 'sub_channel'], target_type: Literal['group', 'direct', 'channel', 'sub_channel'],
target_id: Optional[str], target_id: Optional[str],
bot_id: str, bot_id: str,
bot_self_id: str,
msg_id: str, msg_id: str,
): ):
if isinstance(message, Message): if isinstance(message, Message):
@ -38,6 +39,7 @@ class _Bot:
send = MessageSend( send = MessageSend(
content=message, content=message,
bot_id=bot_id, bot_id=bot_id,
bot_self_id=bot_self_id,
target_type=target_type, target_type=target_type,
target_id=target_id, target_id=target_id,
msg_id=msg_id, msg_id=msg_id,
@ -62,6 +64,7 @@ class Bot:
self.ev = ev self.ev = ev
self.logger = self.bot.logger self.logger = self.bot.logger
self.bot_id = ev.bot_id self.bot_id = ev.bot_id
self.bot_self_id = ev.bot_self_id
async def send(self, message: Union[Message, List[Message], str, bytes]): async def send(self, message: Union[Message, List[Message], str, bytes]):
return await self.bot.target_send( return await self.bot.target_send(
@ -69,6 +72,7 @@ class Bot:
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.bot_id,
self.bot_self_id,
self.ev.msg_id, self.ev.msg_id,
) )
@ -83,5 +87,6 @@ class Bot:
target_type, target_type,
target_id, target_id,
self.ev.bot_id, self.ev.bot_id,
self.ev.bot_self_id,
self.ev.msg_id, self.ev.msg_id,
) )

1
gsuid_core/handler.py
View File

@ -24,6 +24,7 @@ async def get_user_pml(msg: MessageReceive) -> int:
async def msg_process(msg: MessageReceive) -> Event: async def msg_process(msg: MessageReceive) -> Event:
event = Event( event = Event(
msg.bot_id, msg.bot_id,
msg.bot_self_id,
msg.msg_id, msg.msg_id,
msg.user_type, msg.user_type,
msg.group_id, msg.group_id,

2
gsuid_core/models.py
View File

@ -10,6 +10,7 @@ class Message(Struct):
class MessageReceive(Struct): class MessageReceive(Struct):
bot_id: str = 'Bot' bot_id: str = 'Bot'
bot_self_id: str = ''
msg_id: str = '' msg_id: str = ''
user_type: Literal['group', 'direct', 'channel', 'sub_channel'] = 'group' user_type: Literal['group', 'direct', 'channel', 'sub_channel'] = 'group'
group_id: Optional[str] = None group_id: Optional[str] = None
@ -30,6 +31,7 @@ class Event(MessageReceive):
class MessageSend(Struct): class MessageSend(Struct):
bot_id: str = 'Bot' bot_id: str = 'Bot'
bot_self_id: str = ''
msg_id: str = '' msg_id: str = ''
target_type: Optional[str] = None target_type: Optional[str] = None
target_id: Optional[str] = None target_id: Optional[str] = None