From 7b54a801f4ac2848eaad1cc2dc844c5adb84082f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wuyi=E6=97=A0=E7=96=91?= <444835641@qq.com>
Date: Wed, 29 Mar 2023 23:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E7=A7=BB=E9=99=A4at=E6=9C=BA?=
 =?UTF-8?q?=E5=99=A8=E4=BA=BA=E7=9A=84`Message`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/handler.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gsuid_core/handler.py b/gsuid_core/handler.py
index 83d68fd..cc43493 100644
--- a/gsuid_core/handler.py
+++ b/gsuid_core/handler.py
@@ -6,7 +6,7 @@ from gsuid_core.bot import Bot, _Bot
 from gsuid_core.logger import logger
 from gsuid_core.trigger import Trigger
 from gsuid_core.config import core_config
-from gsuid_core.models import Event, MessageReceive
+from gsuid_core.models import Event, Message, MessageReceive
 
 config_masters = core_config.get_config('masters')
 config_superusers = core_config.get_config('superusers')
@@ -77,8 +77,16 @@ async def handle_event(ws: _Bot, msg: MessageReceive):
     if len(valid_event) >= 1:
         sorted_event = sorted(valid_event.items(), key=lambda x: x[1])
         for trigger, _ in sorted_event:
-            bot = Bot(ws, event)
             message = await trigger.get_command(event)
+            if event.bot_self_id in event.at_list:
+                event.at_list.remove(event.bot_self_id)
+                if event.bot_self_id == event.at:
+                    if len(event.at_list) >= 1:
+                        event.at = event.at_list[0]
+                    else:
+                        event.at = None
+                event.content.remove(Message('at', event.bot_self_id))
+            bot = Bot(ws, event)
             logger.info(
                 f'↪ 消息 「{event.raw_text}」 触发'
                 f' 「{trigger.type}」 类型触发器, 关键词:'