From fd2b21f2a2d8250a0b3d2b606b61e394eab5c380 Mon Sep 17 00:00:00 2001 From: Vivien <34387011+vivien8261@users.noreply.github.com> Date: Mon, 18 Mar 2024 10:59:00 +0800 Subject: [PATCH 1/6] update --- core/__init__.py | 2 +- pluginsDev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 0e83d5a6..3c0d1366 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -126,7 +126,7 @@ async def _(_): timestamp = int( time.mktime( time.strptime( - (datetime.datetime.now() + datetime.timedelta(days=-7)).strftime('%Y%m%d'), + (datetime.datetime.now() + datetime.timedelta(days=-90)).strftime('%Y%m%d'), '%Y%m%d', ) ) diff --git a/pluginsDev b/pluginsDev index a505ec02..ef5cef40 160000 --- a/pluginsDev +++ b/pluginsDev @@ -1 +1 @@ -Subproject commit a505ec02a09464e1dce3b3eb2c396f13cf3e40f0 +Subproject commit ef5cef400fcb27626fab398cd4492cfc27f28acc From 6cb6b20e597d17c09416a1ddaf2e2e59632a2751 Mon Sep 17 00:00:00 2001 From: "Songyang.Huo" Date: Thu, 4 Apr 2024 16:23:39 +0800 Subject: [PATCH 2/6] Update requirements.txt --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index bf87161f..c04f6c10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,3 +17,5 @@ requests-html srsly~=2.4.3 starlette~=0.19.1 zhon~=1.1.5 +cos-python-sdk-v5~=1.9.27 +tencentcloud-sdk-python~=3.0.0 From b89899c48838653087f17e8787d8852f57be3b99 Mon Sep 17 00:00:00 2001 From: "Songyang.Huo" Date: Thu, 4 Apr 2024 17:09:07 +0800 Subject: [PATCH 3/6] Update requirements.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c04f6c10..4e459eea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,8 @@ peewee~=3.14.10 pillow==9.5.0 pypinyin~=0.46.0 pyyaml~=6.0 -requests-html +requests-html~=0.10.0 +lxml_html_clean~=0.1.0 srsly~=2.4.3 starlette~=0.19.1 zhon~=1.1.5 From ef7e407981e57da4fed128a2d64bbd055e299182 Mon Sep 17 00:00:00 2001 From: Vivien <34387011+vivien8261@users.noreply.github.com> Date: Wed, 15 May 2024 11:03:07 +0800 Subject: [PATCH 4/6] update --- pluginsDev | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pluginsDev b/pluginsDev index ef5cef40..a4006f1c 160000 --- a/pluginsDev +++ b/pluginsDev @@ -1 +1 @@ -Subproject commit ef5cef400fcb27626fab398cd4492cfc27f28acc +Subproject commit a4006f1cca7e6a693d935789dcc12feaefdd49fd diff --git a/requirements.txt b/requirements.txt index db2b2979..da26ca37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -amiyabot==1.9.0 +amiyabot==1.9.2 attrdict~=2.0.1 baidu-aip dhash~=1.3 From c44d1b9985aade6d6059848f18309b009b5141d7 Mon Sep 17 00:00:00 2001 From: hsyhhssyy Date: Tue, 28 May 2024 03:07:32 +0000 Subject: [PATCH 5/6] store --- core/util/common.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/util/common.py b/core/util/common.py index a7e121e4..b16571e3 100644 --- a/core/util/common.py +++ b/core/util/common.py @@ -358,3 +358,11 @@ def sorted_dict(data: dict, *args, **kwargs): def text_to_pinyin(text: str): return ''.join([item[0] for item in pypinyin.pinyin(text, style=pypinyin.NORMAL)]).lower() + +def get_resource_dir(): + absolute_path = os.path.abspath('./resource') + return absolute_path + +def get_plugin_dir(): + absolute_path = os.path.abspath('./plugins') + return absolute_path \ No newline at end of file From 3255505b5772dc2ee0e5daf55781821c828c5abb Mon Sep 17 00:00:00 2001 From: Vivien <34387011+vivien8261@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:10:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?update=20=E6=94=AF=E6=8C=81=E5=85=A8?= =?UTF-8?q?=E5=9F=9Fbot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/publish.txt | 2 +- core/database/bot.py | 11 ++++++++--- pluginsDev | 2 +- requirements.txt | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/publish.txt b/.github/publish.txt index 64b26fba..3b982875 100644 --- a/.github/publish.txt +++ b/.github/publish.txt @@ -1 +1 @@ -v6.4.5 +v6.4.6 diff --git a/core/database/bot.py b/core/database/bot.py index e001ab4b..04f4cc49 100644 --- a/core/database/bot.py +++ b/core/database/bot.py @@ -5,6 +5,7 @@ from core.cosChainBuilder import COSQQGroupChainBuilder from typing import Union +from amiyabot.adapters.tencent.qqGlobal import qq_global from amiyabot.adapters.tencent.qqGroup import qq_group, QQGroupChainBuilderOptions from amiyabot.adapters.cqhttp import cq_http from amiyabot.adapters.mirai import mirai_api_http @@ -69,6 +70,10 @@ def build_conf(cls, item): 'onebot12': onebot12, 'com_wechat': com_wechat, } + tx_adapters = { + 'qq_group': qq_group, + 'qq_global': qq_global, + } conf = { 'appid': item.appid, @@ -83,19 +88,19 @@ def build_conf(cls, item): http_port=item.http_port, ) - if item.adapter == 'qq_group': + if item.adapter in tx_adapters: opt = QQGroupChainBuilderOptions( item.host or '0.0.0.0', item.http_port or 8086, './resource/group_temp', ) if cos_config.activate: - conf['adapter'] = qq_group( + conf['adapter'] = tx_adapters[item.adapter]( item.client_secret, default_chain_builder=COSQQGroupChainBuilder(opt), ) else: - conf['adapter'] = qq_group( + conf['adapter'] = tx_adapters[item.adapter]( item.client_secret, default_chain_builder_options=opt, ) diff --git a/pluginsDev b/pluginsDev index a4006f1c..ce92f27d 160000 --- a/pluginsDev +++ b/pluginsDev @@ -1 +1 @@ -Subproject commit a4006f1cca7e6a693d935789dcc12feaefdd49fd +Subproject commit ce92f27d75a51c65f5cb3dc148fcf891220bf22c diff --git a/requirements.txt b/requirements.txt index da26ca37..6be56798 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -amiyabot==1.9.2 +amiyabot==1.9.3 attrdict~=2.0.1 baidu-aip dhash~=1.3