Merge pull request #264 from AmiyaBot/V6-dev

V6 dev

.github/publish.txt

@@ -1 +1 @@
-v6.4.2
+v6.4.3

core/database/bot.py

@@ -1,13 +1,15 @@
 from amiyabot import AmiyaBot, KOOKBotInstance
 from amiyabot.database import *
-from amiyabot.adapters.mirai import mirai_api_http
+from core.database import config, is_mysql
+from typing import Union
+
+from amiyabot.adapters.tencent.qqGroup import qq_group, QQGroupChainBuilderOptions
 from amiyabot.adapters.cqhttp import cq_http
+from amiyabot.adapters.mirai import mirai_api_http
 from amiyabot.adapters.onebot.v11 import onebot11
 from amiyabot.adapters.onebot.v12 import onebot12
 from amiyabot.adapters.comwechat import com_wechat
 from amiyabot.adapters.test import test_instance
-from core.database import config, is_mysql
-from typing import Union
 
 db = connect_database('amiya_bot' if is_mysql else 'database/amiya_bot.db', is_mysql, config)
 
@@ -40,12 +42,24 @@ class BotAccounts(BotBaseModel):
     host: str = CharField(null=True)
     ws_port: int = IntegerField(null=True)
     http_port: int = IntegerField(null=True)
+    client_secret: str = CharField(null=True)
 
     @classmethod
     def get_all_account(cls):
         select: List[cls] = cls.select()
         account = []
 
+        for item in select:
+            if not item.is_start:
+                continue
+
+            conf = cls.build_conf(item)
+            account.append(AmiyaBot(**conf))
+
+        return account
+
+    @classmethod
+    def build_conf(cls, item):
         net_adapters = {
             'mirai_api_http': mirai_api_http,
             'cq_http': cq_http,
@@ -54,32 +68,36 @@ def get_all_account(cls):
             'com_wechat': com_wechat,
         }
 
-        for item in select:
-            if not item.is_start:
-                continue
-
-            conf = {
-                'appid': item.appid,
-                'token': item.token,
-                'private': bool(item.private),
-            }
-
-            if item.adapter in net_adapters:
-                conf['adapter'] = net_adapters[item.adapter](
-                    host=item.host,
-                    ws_port=item.ws_port,
-                    http_port=item.http_port,
-                )
-
-            if item.adapter == 'websocket':
-                conf['adapter'] = test_instance(item.host, item.ws_port)
-
-            if item.adapter == 'kook':
-                conf['adapter'] = KOOKBotInstance
-
-            account.append(AmiyaBot(**conf))
+        conf = {
+            'appid': item.appid,
+            'token': item.token,
+            'private': bool(item.private),
+        }
 
-        return account
+        if item.adapter in net_adapters:
+            conf['adapter'] = net_adapters[item.adapter](
+                host=item.host,
+                ws_port=item.ws_port,
+                http_port=item.http_port,
+            )
+
+        if item.adapter == 'qq_group':
+            conf['adapter'] = qq_group(
+                item.client_secret,
+                default_chain_builder_options=QQGroupChainBuilderOptions(
+                    item.host or '0.0.0.0',
+                    item.http_port or 8086,
+                    './resource/group_temp',
+                ),
+            )
+
+        if item.adapter == 'websocket':
+            conf['adapter'] = test_instance(item.host, item.ws_port)
+
+        if item.adapter == 'kook':
+            conf['adapter'] = KOOKBotInstance
+
+        return conf
 
 
 @table

core/server/bot.py

@@ -2,14 +2,8 @@
 
 from core import app, bot
 from core.database.bot import BotAccounts, query_to_list
-from amiyabot.adapters.mirai import mirai_api_http
-from amiyabot.adapters.cqhttp import cq_http
-from amiyabot.adapters.onebot.v11 import onebot11
-from amiyabot.adapters.onebot.v12 import onebot12
-from amiyabot.adapters.comwechat import com_wechat
-from amiyabot.adapters.test import test_instance
 from amiyabot.network.httpServer import BaseModel
-from amiyabot import AmiyaBot, KOOKBotInstance
+from amiyabot import AmiyaBot
 
 
 class BotAppId(BaseModel):
@@ -24,9 +18,11 @@ class BotAccountModel(BotAppId):
     is_start: int = 1
     adapter: str = 'tencent'
     console_channel: Optional[str] = None
+
     host: Optional[str] = None
     ws_port: Optional[int] = None
     http_port: Optional[int] = None
+    client_secret: Optional[str] = None
 
     start: int = 0
 
@@ -96,32 +92,7 @@ async def run_bot(self, data: BotAccountModel):
         if data.appid in bot:
             return app.response(code=500, message='Bot 已存在')
 
-        net_adapters = {
-            'mirai_api_http': mirai_api_http,
-            'cq_http': cq_http,
-            'onebot11': onebot11,
-            'onebot12': onebot12,
-            'com_wechat': com_wechat,
-        }
-        conf = {
-            'appid': data.appid,
-            'token': data.token,
-            'private': bool(data.private),
-        }
-
-        if data.adapter in net_adapters:
-            conf['adapter'] = net_adapters[data.adapter](
-                host=data.host,
-                ws_port=data.ws_port,
-                http_port=data.http_port,
-            )
-
-        if data.adapter == 'websocket':
-            conf['adapter'] = test_instance(data.host, data.ws_port)
-
-        if data.adapter == 'kook':
-            conf['adapter'] = KOOKBotInstance
-
+        conf = BotAccounts.build_conf(data)
         bot.append(AmiyaBot(**conf), launch_browser=True)
 
         return app.response(message=f'正在启动 AppId {data.appid}')

requirements.txt

@@ -1,4 +1,4 @@
-amiyabot==1.8.4
+amiyabot==1.8.6
 attrdict~=2.0.1
 baidu-aip
 dhash~=1.3