From 42a85ddbb105fcdf322526b88471f5e7b9cd64e4 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Mon, 19 Dec 2022 17:07:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BE=A4=E5=86=85=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=8Dat=E6=9C=BA=E5=99=A8=E4=BA=BA=E4=B9=9F=E8=83=BD?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/qqbot/manager.py | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py
index ec7c2090..b06e7be4 100644
--- a/pkg/qqbot/manager.py
+++ b/pkg/qqbot/manager.py
@@ -28,6 +28,24 @@ def go(func, args=()):
     thread.start()
 
 
+# 检查消息是否符合泛响应匹配机制
+def check_response_rule(text: str) -> (bool, str):
+    rules = config.response_rules
+    # 检查前缀匹配
+    for rule in rules['prefix']:
+        if text.startswith(rule):
+            return True, text.replace(rule, "", 1)
+
+    # 检查正则表达式匹配
+    for rule in rules['regex']:
+        import re
+        match = re.match(rule, text)
+        if match:
+            return True, match.group(1)
+
+    return False, ""
+
+
 # 控制QQ消息输入输出的类
 class QQBotManager:
     timeout = 60
@@ -265,11 +283,8 @@ class QQBotManager:
 
         reply = ''
 
-        if Image in event.message_chain:
-            pass
-        elif At(self.bot.qq) not in event.message_chain:
-            pass
-        else:
+        def process(text = None) -> str:
+            replys = ""
             event.message_chain.remove(At(self.bot.qq))
 
             processing.append("group_{}".format(event.sender.id))
@@ -278,7 +293,8 @@ class QQBotManager:
             failed = 0
             for i in range(self.retry):
                 try:
-                    reply = self.process_message('group', event.group.id, str(event.message_chain).strip())
+                    replys = self.process_message('group', event.group.id,
+                                                  str(event.message_chain).strip() if text is None else text)
                     break
                 except FunctionTimedOut:
                     failed += 1
@@ -286,7 +302,20 @@ class QQBotManager:
 
             if failed == self.retry:
                 self.notify_admin("{} 请求超时".format("group_{}".format(event.sender.id)))
-                reply = "[bot]err:请求超时"
+                replys = "[bot]err:请求超时"
+
+            return replys
+
+        if Image in event.message_chain:
+            pass
+        elif At(self.bot.qq) not in event.message_chain:
+            check, result = check_response_rule(str(event.message_chain).strip())
+
+            if check:
+                reply = process(result)
+        else:
+            # 直接调用
+            reply = process()
 
         if reply != '':
             return self.send(event, reply)