From ce1247f2fd3ede228a4ff8e759b336f57d0802e9 Mon Sep 17 00:00:00 2001 From: Bakadax Date: Mon, 21 Apr 2025 20:36:38 +0800 Subject: [PATCH 1/5] modified: src/plugins/chat/utils.py --- src/plugins/chat/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index 3e4cfa52d..739fc6c7e 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -76,7 +76,7 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, float]: else: if not is_mentioned: # 判断是否被回复 - if re.match("回复[\s\S]*?\((\d+)\)的消息，说：", message.processed_plain_text): + if re.match(f"回复[\s\S]*?\({global_config.BOT_QQ}\)的消息，说：", message.processed_plain_text): is_mentioned = True # 判断内容中是否被提及 From 6a21f3408e7f3981275cba4dbf57daa3b3656c3a Mon Sep 17 00:00:00 2001 From: Bakadax Date: Tue, 22 Apr 2025 09:29:47 +0800 Subject: [PATCH 2/5] modified: src/plugins/chat/utils.py --- src/plugins/chat/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index 739fc6c7e..ed316635d 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -76,12 +76,12 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, float]: else: if not is_mentioned: # 判断是否被回复 - if re.match(f"回复[\s\S]*?\({global_config.BOT_QQ}\)的消息，说：", message.processed_plain_text): + if re.match(f"\[回复 [\s\S]*?\({str(global_config.BOT_QQ)}\)：[\s\S]*?\]，说：", message.processed_plain_text): is_mentioned = True # 判断内容中是否被提及 message_content = re.sub(r"@[\s\S]*?（(\d+)）", "", message.processed_plain_text) - message_content = re.sub(r"回复[\s\S]*?\((\d+)\)的消息，说： ", "", message_content) + message_content = re.sub(r"\[回复 [\s\S]*?\((\d+)|未知id\)：[\s\S]*?\]，说：", "", message_content) for keyword in keywords: if keyword in message_content: is_mentioned = True From 273647f958ce19271789d72567f1b4e8a0f66c71 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 22 Apr 2025 01:30:21 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index ed316635d..48ddc12c7 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -76,7 +76,9 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, float]: else: if not is_mentioned: # 判断是否被回复 - if re.match(f"\[回复 [\s\S]*?\({str(global_config.BOT_QQ)}\)：[\s\S]*?\]，说：", message.processed_plain_text): + if re.match( + f"\[回复 [\s\S]*?\({str(global_config.BOT_QQ)}\)：[\s\S]*?\]，说：", message.processed_plain_text + ): is_mentioned = True # 判断内容中是否被提及 From 062d6d46b785e1cc27362ca3acfb67f17d1c0c19 Mon Sep 17 00:00:00 2001 From: Bakadax Date: Tue, 22 Apr 2025 09:34:10 +0800 Subject: [PATCH 4/5] modified: src/plugins/chat/utils.py --- src/plugins/chat/utils.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index ed316635d..36656dc91 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -78,16 +78,16 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, float]: # 判断是否被回复 if re.match(f"\[回复 [\s\S]*?\({str(global_config.BOT_QQ)}\)：[\s\S]*?\]，说：", message.processed_plain_text): is_mentioned = True - - # 判断内容中是否被提及 - message_content = re.sub(r"@[\s\S]*?（(\d+)）", "", message.processed_plain_text) - message_content = re.sub(r"\[回复 [\s\S]*?\((\d+)|未知id\)：[\s\S]*?\]，说：", "", message_content) - for keyword in keywords: - if keyword in message_content: - is_mentioned = True - for nickname in nicknames: - if nickname in message_content: - is_mentioned = True + else: + # 判断内容中是否被提及 + message_content = re.sub(r"@[\s\S]*?（(\d+)）", "", message.processed_plain_text) + message_content = re.sub(r"\[回复 [\s\S]*?\((\d+)|未知id\)：[\s\S]*?\]，说：", "", message_content) + for keyword in keywords: + if keyword in message_content: + is_mentioned = True + for nickname in nicknames: + if nickname in message_content: + is_mentioned = True if is_mentioned and global_config.mentioned_bot_inevitable_reply: reply_probability = 1.0 logger.info("被提及，回复概率设置为100%") From e3271e354b9a820ff3744bf4056f0952f5ba01ab Mon Sep 17 00:00:00 2001 From: Bakadax Date: Tue, 22 Apr 2025 11:03:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=91=9C=E5=91=9C~=E8=AE=A8=E5=8E=8C?= =?UTF-8?q?=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index 55d6f62b3..271386ff5 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -83,7 +83,7 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, float]: else: # 判断内容中是否被提及 message_content = re.sub(r"@[\s\S]*?（(\d+)）", "", message.processed_plain_text) - message_content = re.sub(r"\[回复 [\s\S]*?\((\d+)|未知id\)：[\s\S]*?\]，说：", "", message_content) + message_content = re.sub(r"\[回复 [\s\S]*?\(((\d+)|未知id)\)：[\s\S]*?\]，说：", "", message_content) for keyword in keywords: if keyword in message_content: is_mentioned = True