From 0e54c60b63f8fd64021b2c34f828a458aa7ecad3 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Fri, 22 Sep 2023 01:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E5=BC=95=E5=85=A5`ev.real=5Fbot?=
 =?UTF-8?q?=5Fid`=E8=A7=A3=E5=86=B3=E5=90=8C=E4=B8=AA=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=AB=AF=E4=BD=86=E4=B8=8D=E5=90=8C=E5=8D=8F=E8=AE=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/bot.py     | 4 ++--
 gsuid_core/handler.py | 8 +++++++-
 gsuid_core/models.py  | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gsuid_core/bot.py b/gsuid_core/bot.py
index 4f65288..2d9b2f5 100644
--- a/gsuid_core/bot.py
+++ b/gsuid_core/bot.py
@@ -139,7 +139,7 @@ class Bot:
             message,
             self.ev.user_type,
             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.ev.msg_id,
             at_sender,
@@ -158,7 +158,7 @@ class Bot:
             message,
             target_type,
             target_id,
-            self.ev.bot_id,
+            self.ev.real_bot_id,
             self.ev.bot_self_id,
             self.ev.msg_id,
             at_sender,
diff --git a/gsuid_core/handler.py b/gsuid_core/handler.py
index 64dd3b6..062f2c9 100644
--- a/gsuid_core/handler.py
+++ b/gsuid_core/handler.py
@@ -24,14 +24,20 @@ async def get_user_pml(msg: MessageReceive) -> int:
 
 
 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(
-        msg.bot_id,
+        bot_id,
         msg.bot_self_id,
         msg.msg_id,
         msg.user_type,
         msg.group_id,
         msg.user_id,
         msg.user_pm,
+        real_bot_id=msg.bot_id,
     )
     _content: List[Message] = []
     for _msg in msg.content:
diff --git a/gsuid_core/models.py b/gsuid_core/models.py
index 51a0ac7..de4749d 100644
--- a/gsuid_core/models.py
+++ b/gsuid_core/models.py
@@ -20,6 +20,7 @@ class MessageReceive(Struct):
 
 
 class Event(MessageReceive):
+    real_bot_id: str = ''
     raw_text: str = ''
     command: str = ''
     text: str = ''