From bb9691ad04c64d4563f9122eb300db51c65ecdd5 Mon Sep 17 00:00:00 2001
From: Bakadax <bakadax@qq.com>
Date: Fri, 28 Mar 2025 16:27:41 +0800
Subject: [PATCH] 	modified:   src/plugins/chat/bot.py

---
 src/plugins/chat/bot.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py
index 6d6e6c51..be333de9 100644
--- a/src/plugins/chat/bot.py
+++ b/src/plugins/chat/bot.py
@@ -138,20 +138,19 @@ class ChatBot:
 
         # 处理提及
         reply_probability = 0
-        if groupinfo.group_id in global_config.talk_allowed_groups:
-            if (f"[CQ:at,qq={global_config.BOT_QQ}" in message_cq.raw_message) and global_config.at_bot_inevitable_reply:
-                reply_probability = 1
+        if (f"[CQ:at,qq={global_config.BOT_QQ}" in message_cq.raw_message) and global_config.at_bot_inevitable_reply:
+            reply_probability = 1
+            is_mentioned = True
+            logger.info("被@，回复概率设置为100%")
+        else:
+            is_reply = is_reply_bot_in_message(message_cq.reply_message)
+            if is_reply:
                 is_mentioned = True
-                logger.info("被@，回复概率设置为100%")
             else:
-                is_reply = is_reply_bot_in_message(message_cq.reply_message)
-                if is_reply:
-                    is_mentioned = True
-                else:
-                    is_mentioned = is_mentioned_bot_in_message(message)
-                if is_mentioned and global_config.metioned_bot_inevitable_reply:
-                    reply_probability = 1
-                    logger.info("被提及，回复概率设置为100%")
+                is_mentioned = is_mentioned_bot_in_message(message)
+            if is_mentioned and global_config.metioned_bot_inevitable_reply:
+                reply_probability = 1
+                logger.info("被提及，回复概率设置为100%")
 
         # 计算回复意愿
         if global_config.enable_think_flow:
@@ -173,7 +172,7 @@ class ChatBot:
             sender_id=str(message.message_info.user_info.user_id),
         )
         
-        if reply_probability != 1:
+        if reply_probability != 1 or (groupinfo and (groupinfo.group_id not in global_config.talk_allowed_groups)):
             reply_probability = real_reply_probability
 
         logger.info(