From af76364619b676e48597caf26f036226cd506871 Mon Sep 17 00:00:00 2001
From: hissin <hissin@126.com>
Date: Tue, 20 Dec 2022 22:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81=EF=BC=8C=E7=94=A8=E4=BA=8Ews?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E5=86=B2=E7=AA=81=E6=97=B6=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?http=E9=80=82=E9=85=8D=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config-template.py   |  2 ++
 pkg/qqbot/manager.py | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config-template.py b/config-template.py
index b30da67a..aa1a65ef 100644
--- a/config-template.py
+++ b/config-template.py
@@ -3,11 +3,13 @@ import logging
 
 # [必需] Mirai的配置
 # 请到配置mirai的步骤中的教程查看每个字段的信息
+# adapter: 选择适配器，目前支持HTTPAdapter和WebSocketAdapter
 # host: 运行mirai的主机地址
 # port: 运行mirai的主机端口
 # verifyKey: mirai-api-http的verifyKey
 # qq: 机器人的QQ号
 mirai_http_api_config = {
+    "adapter": "HTTPAdapter",
     "host": "localhost",
     "port": 8080,
     "verifyKey": "yirimirai",
diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py
index 04e41e35..517b8f57 100644
--- a/pkg/qqbot/manager.py
+++ b/pkg/qqbot/manager.py
@@ -4,7 +4,7 @@ import os
 import threading
 
 import openai.error
-from mirai import At, GroupMessage, MessageEvent, Mirai, Plain, StrangerMessage, WebSocketAdapter, FriendMessage, Image
+from mirai import At, GroupMessage, MessageEvent, Mirai, Plain, StrangerMessage, WebSocketAdapter,HTTPAdapter, FriendMessage, Image
 
 import config
 import pkg.openai.session
@@ -73,7 +73,8 @@ class QQBotManager:
         else:
             self.reply_filter = pkg.qqbot.filter.ReplyFilter([])
 
-        bot = Mirai(
+        if mirai_http_api_config['adapter'] == "WebSocketAdapter":
+            bot = Mirai(
             qq=mirai_http_api_config['qq'],
             adapter=WebSocketAdapter(
                 verify_key=mirai_http_api_config['verifyKey'],
@@ -81,6 +82,15 @@ class QQBotManager:
                 port=mirai_http_api_config['port']
             )
         )
+        elif mirai_http_api_config['adapter'] == "HTTPAdapter":
+            bot = Mirai(
+            qq=mirai_http_api_config['qq'],
+            adapter=HTTPAdapter(
+                verify_key=mirai_http_api_config['verifyKey'],
+                host=mirai_http_api_config['host'],
+                port=mirai_http_api_config['port']
+            )
+        )
 
         @bot.on(FriendMessage)
         async def on_friend_message(event: FriendMessage):