From 48523374682955606639a9dfa1f97734592e7974 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Tue, 27 Apr 2021 15:42:52 +0800 Subject: [PATCH] update to v0.2.7 --- pyproject.toml | 2 +- src/plugins/nonebot_hk_reporter/config_manager.py | 2 +- src/plugins/nonebot_hk_reporter/post.py | 8 +++++--- src/plugins/nonebot_hk_reporter/scheduler.py | 11 +++++------ src/plugins/nonebot_hk_reporter/send.py | 3 --- src/plugins/nonebot_hk_reporter/utils.py | 15 ++++++--------- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e1b8373..76eae06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-hk-reporter" -version = "0.2.6" +version = "0.2.7" description = "Subscribe message from social medias" authors = ["felinae98 "] license = "MIT" diff --git a/src/plugins/nonebot_hk_reporter/config_manager.py b/src/plugins/nonebot_hk_reporter/config_manager.py index 7f9b7a6..a562d67 100644 --- a/src/plugins/nonebot_hk_reporter/config_manager.py +++ b/src/plugins/nonebot_hk_reporter/config_manager.py @@ -41,7 +41,7 @@ async def add_sub_parse_platform(bot: Bot, event: Event, state: T_State): return platform = str(event.get_message()).strip() if platform == '全部': - message = '全部平台' + \ + message = '全部平台\n' + \ '\n'.join(['{}:{}'.format(platform_name, platform.name) \ for platform_name, platform in platform_manager.items()]) await add_sub.reject(message) diff --git a/src/plugins/nonebot_hk_reporter/post.py b/src/plugins/nonebot_hk_reporter/post.py index 4609e6c..9243b89 100644 --- a/src/plugins/nonebot_hk_reporter/post.py +++ b/src/plugins/nonebot_hk_reporter/post.py @@ -1,10 +1,12 @@ import base64 from dataclasses import dataclass, field from io import BytesIO -from typing import NoReturn, Optional -from nonebot import logger -import httpx +from typing import Optional + from PIL import Image +import httpx +from nonebot import logger + from .plugin_config import plugin_config from .utils import parse_text diff --git a/src/plugins/nonebot_hk_reporter/scheduler.py b/src/plugins/nonebot_hk_reporter/scheduler.py index d61b3c3..605766c 100644 --- a/src/plugins/nonebot_hk_reporter/scheduler.py +++ b/src/plugins/nonebot_hk_reporter/scheduler.py @@ -1,10 +1,11 @@ +from apscheduler.schedulers.asyncio import AsyncIOScheduler import nonebot from nonebot import get_driver, logger -from .send import do_send_msgs -from .platform import platform_manager + from .config import Config +from .platform import platform_manager +from .send import do_send_msgs from .send import send_msgs -from apscheduler.schedulers.asyncio import AsyncIOScheduler scheduler = AsyncIOScheduler() @@ -39,6 +40,4 @@ for platform_name, platform in platform_manager.items(): fetch_and_send, 'interval', seconds=platform.schedule_interval, args=(platform_name,)) -@scheduler.scheduled_job('interval', seconds=1) -async def _send_msgs(): - await do_send_msgs() +scheduler.add_job(do_send_msgs, 'interval', seconds=0.3) diff --git a/src/plugins/nonebot_hk_reporter/send.py b/src/plugins/nonebot_hk_reporter/send.py index d824061..2dcc07b 100644 --- a/src/plugins/nonebot_hk_reporter/send.py +++ b/src/plugins/nonebot_hk_reporter/send.py @@ -1,8 +1,5 @@ -from nonebot.adapters.cqhttp import Bot -import nonebot from nonebot import logger import time -import asyncio QUEUE = [] LAST_SEND_TIME = time.time() diff --git a/src/plugins/nonebot_hk_reporter/utils.py b/src/plugins/nonebot_hk_reporter/utils.py index fb51cfe..6da7785 100644 --- a/src/plugins/nonebot_hk_reporter/utils.py +++ b/src/plugins/nonebot_hk_reporter/utils.py @@ -1,15 +1,12 @@ -import os import asyncio -from typing import Awaitable, Callable, Optional -import nonebot -from nonebot import logger -import base64 -from pyppeteer import launch -from pyppeteer.page import Page -from pyppeteer.chromium_downloader import check_chromium, download_chromium from html import escape -from hashlib import sha256 +import os from tempfile import NamedTemporaryFile +from typing import Awaitable, Callable, Optional + +from pyppeteer import launch +from pyppeteer.chromium_downloader import check_chromium, download_chromium +from pyppeteer.page import Page from .plugin_config import plugin_config