From a810158d5b44cb4e0bf8d69d471ca96a1a0ffb99 Mon Sep 17 00:00:00 2001
From: chordfish <592229466@qq.com>
Date: Fri, 10 Mar 2023 12:43:07 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E4=B8=8D=E5=93=8D=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/openai/dprompt.py | 11 ++++++++++-
 pkg/qqbot/manager.py  |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkg/openai/dprompt.py b/pkg/openai/dprompt.py
index 4812d9f5..e45ab9ed 100644
--- a/pkg/openai/dprompt.py
+++ b/pkg/openai/dprompt.py
@@ -102,6 +102,15 @@ def get_prompt(name: str = None) -> str:
 
         for key in default_dict:
             if key.lower().startswith(name.lower()):
-                return default_dict[key], None, None
+                return [
+                    {
+                    "role":"user",
+                    "content":default_dict[key]
+                    },
+                    {
+                    "role":"assistant",
+                    "content":"好的。"
+                    }
+                    ], None, None
 
         raise KeyError("未找到默认情景预设: " + name)
diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py
index 5f33a95f..2fbda748 100644
--- a/pkg/qqbot/manager.py
+++ b/pkg/qqbot/manager.py
@@ -23,7 +23,7 @@ import pkg.plugin.models as plugin_models
 
 
 # 检查消息是否符合泛响应匹配机制
-def check_response_rule(text: str, event):
+def check_response_rule(text: str):
     config = pkg.utils.context.get_config()
     if not hasattr(config, 'response_rules'):
         return False, ''
@@ -318,7 +318,7 @@ class QQBotManager:
                 # 直接调用
                 reply = process()
             else:
-                check, result = check_response_rule(str(event.message_chain).strip(), event)
+                check, result = check_response_rule(str(event.message_chain).strip())
 
                 if check:
                     reply = process(result.strip())