From d429dd7f1aa3901a0f620cc6cda7e53e90f69280 Mon Sep 17 00:00:00 2001
From: dax <88696221+Dax233@users.noreply.github.com>
Date: Wed, 26 Mar 2025 13:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E5=8F=8A=E5=BF=85?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8A=9F=E8=83=BD=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/chat/bot.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py
index e8937521..f29f8755 100644
--- a/src/plugins/chat/bot.py
+++ b/src/plugins/chat/bot.py
@@ -135,15 +135,23 @@ class ChatBot:
 
         await self.storage.store_message(message, chat, topic[0] if topic else None)
 
-        is_mentioned = is_mentioned_bot_in_message(message)
-        reply_probability = await willing_manager.change_reply_willing_received(
-            chat_stream=chat,
-            is_mentioned_bot=is_mentioned,
-            config=global_config,
-            is_emoji=message.is_emoji,
-            interested_rate=interested_rate,
-            sender_id=str(message.message_info.user_info.user_id),
-        )
+        if ( f"[CQ:at,qq={global_config.BOT_QQ},name=" in message_cq.raw_message ) and global_config.at_bot_inevitable_reply:
+            reply_probability = 1
+            logger.info(f"被@，回复概率设置为100%")
+        else:
+            is_mentioned = is_mentioned_bot_in_message(message)
+            if is_mentioned and global_config.metioned_bot_inevitable_reply:
+                reply_probability = 1
+                logger.info(f"被提及，回复概率设置为100%")
+            else:
+                reply_probability = await willing_manager.change_reply_willing_received(
+                    chat_stream=chat,
+                    is_mentioned_bot=is_mentioned,
+                    config=global_config,
+                    is_emoji=message.is_emoji,
+                    interested_rate=interested_rate,
+                    sender_id=str(message.message_info.user_info.user_id),
+                )
         
         if global_config.enable_think_flow:
             current_willing_old = willing_manager.get_willing(chat_stream=chat)