From 9ebeff70994191abe6052e53bb58541f08917f5a Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Sun, 20 Mar 2022 09:06:49 +0800 Subject: =?UTF-8?q?=E2=9C=A8=20=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/essential.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'ATRI/plugins/essential.py') diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py index 6ec5401..f71a472 100644 --- a/ATRI/plugins/essential.py +++ b/ATRI/plugins/essential.py @@ -2,6 +2,7 @@ import os import json import shutil import asyncio +from time import sleep from datetime import datetime from pydantic.main import BaseModel from random import choice, randint @@ -33,6 +34,7 @@ from ATRI.log import logger as log from ATRI.config import BotSelfConfig from ATRI.utils import MessageChecker from ATRI.utils.apscheduler import scheduler +from ATRI.utils.check_update import CheckUpdate driver = ATRI.driver() @@ -50,6 +52,17 @@ os.makedirs(TEMP_PATH, exist_ok=True) @driver.on_startup async def startup(): log.info(f"Now running: {ATRI.__version__}") + + log.info("Starting to check update...") + log.info(await CheckUpdate.show_latest_commit_info()) + sleep(1) + + l_v, l_v_t = await CheckUpdate.show_latest_version() + if l_v != ATRI.__version__: + log.warning("New version has been released, please update.") + log.warning(f"Latest version: {l_v} Update time: {l_v_t}") + sleep(3) + log.info("アトリは、高性能ですから！") @@ -106,14 +119,9 @@ class GroupRequestInfo(BaseModel): is_approve: bool -__doc__ = """ -对bot基础/必须请求进行处理 -""" - - class Essential(Service): def __init__(self): - Service.__init__(self, "基础部件", __doc__) + Service.__init__(self, "基础部件", "对bot基础/必须请求进行处理") friend_add_event = Essential().on_request("好友添加", "好友添加检测") @@ -279,6 +287,7 @@ async def _recall_group_event(bot: Bot, event: GroupRecallNoticeEvent): except BaseException: return + log.debug(f"Recall raw msg:\n{repo}") user = event.user_id group = event.group_id repo = repo["message"] @@ -310,6 +319,7 @@ async def _recall_private_event(bot: Bot, event: FriendRecallNoticeEvent): except BaseException: return + log.debug(f"Recall raw msg:\n{repo}") user = event.user_id repo = repo["message"] -- cgit v1.2.3 From cc5c0fab220776508eab9ac6831f8efa1010d083 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Sun, 20 Mar 2022 01:09:34 +0000 Subject: =?UTF-8?q?:rotating=5Flight:=20=E8=87=AA=E5=8A=A8=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/essential.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ATRI/plugins/essential.py') diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py index f71a472..6a2ee22 100644 --- a/ATRI/plugins/essential.py +++ b/ATRI/plugins/essential.py @@ -56,13 +56,13 @@ async def startup(): log.info("Starting to check update...") log.info(await CheckUpdate.show_latest_commit_info()) sleep(1) - + l_v, l_v_t = await CheckUpdate.show_latest_version() if l_v != ATRI.__version__: log.warning("New version has been released, please update.") log.warning(f"Latest version: {l_v} Update time: {l_v_t}") sleep(3) - + log.info("アトリは、高性能ですから！") -- cgit v1.2.3 From 138513235bdcb8dfde5f241273a7cb687606dc1a Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Sun, 27 Mar 2022 15:44:25 +0800 Subject: =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=B6=85=E6=97=B6=E8=80=8C=E5=BC=BA=E5=88=B6=E9=80=80?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/essential.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'ATRI/plugins/essential.py') diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py index 6a2ee22..242e267 100644 --- a/ATRI/plugins/essential.py +++ b/ATRI/plugins/essential.py @@ -53,15 +53,18 @@ os.makedirs(TEMP_PATH, exist_ok=True) async def startup(): log.info(f"Now running: {ATRI.__version__}") - log.info("Starting to check update...") - log.info(await CheckUpdate.show_latest_commit_info()) - sleep(1) - - l_v, l_v_t = await CheckUpdate.show_latest_version() - if l_v != ATRI.__version__: - log.warning("New version has been released, please update.") - log.warning(f"Latest version: {l_v} Update time: {l_v_t}") - sleep(3) + try: + log.info("Starting to check update...") + log.info(await CheckUpdate.show_latest_commit_info()) + sleep(1) + + l_v, l_v_t = await CheckUpdate.show_latest_version() + if l_v != ATRI.__version__: + log.warning("New version has been released, please update.") + log.warning(f"Latest version: {l_v} Update time: {l_v_t}") + sleep(3) + except Exception: + log.error("检查 更新/最新推送 失败...") log.info("アトリは、高性能ですから！") @@ -357,7 +360,7 @@ async def _(): await acc_recall.finish("现在可以接受撤回信息啦！") -@scheduler.scheduled_job("interval", name="清除缓存", minutes=30, misfire_grace_time=5) +@scheduler.scheduled_job("interval", name="清除缓存", minutes=30, misfire_grace_time=5) # type: ignore async def _clear_cache(): try: shutil.rmtree(TEMP_PATH) -- cgit v1.2.3 From 1caf5ae8bb3e0560451f967f276ff1291a80d1dd Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Mon, 4 Apr 2022 17:06:09 +0800 Subject: =?UTF-8?q?=F0=9F=A7=B1=20=E9=92=88=E5=AF=B9=20=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/essential.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ATRI/plugins/essential.py') diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py index 242e267..37c18a4 100644 --- a/ATRI/plugins/essential.py +++ b/ATRI/plugins/essential.py @@ -66,6 +66,10 @@ async def startup(): except Exception: log.error("检查 更新/最新推送 失败...") + if not scheduler.running: + scheduler.start() + log.info("Scheduler Started.") + log.info("アトリは、高性能ですから！") -- cgit v1.2.3