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):