update 0.0.6.0

plugins/alapi/__init__.py

@@ -1,3 +1,11 @@
+from configs.config import Config
 import nonebot
 
 nonebot.load_plugins("plugins/alapi")
+
+Config.add_plugin_config(
+    "alapi",
+    "ALAPI_TOKEN",
+    None,
+    help_="在https://admin.alapi.cn/user/login登录后获取token"
+)

plugins/alapi/comments_163.py

@@ -1,7 +1,6 @@
 from nonebot import on_command
 from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
 from nonebot.typing import T_State
-from configs.config import ALAPI_TOKEN
 from .data_source import get_data
 from services.log import logger
 
@@ -34,8 +33,7 @@ comments_163_url = "https://v2.alapi.cn/api/comment"
 
 @comments_163.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
-    params = {"token": ALAPI_TOKEN}
-    data, code = await get_data(comments_163_url, params)
+    data, code = await get_data(comments_163_url)
     if code != 200:
         await comments_163.finish(data, at_sender=True)
     data = data["data"]

plugins/alapi/cover.py

@@ -1,53 +1,48 @@
 from nonebot import on_command
 from nonebot.adapters.cqhttp import Bot, MessageEvent, Message, GroupMessageEvent
 from nonebot.typing import T_State
-from configs.config import ALAPI_TOKEN
 from utils.message_builder import image
 from utils.utils import get_message_text
 from .data_source import get_data
 from services.log import logger
 
-__zx_plugin_name__ = 'b封面'
-__plugin_usage__ = """usage：
+__zx_plugin_name__ = "b封面"
+__plugin_usage__ = """
+usage：
     b封面 [链接/av/bv/cv/直播id]
     示例：b封面 av86863038
-"""
-__plugin_des__ = '快捷的b站视频封面获取方式'
-__plugin_cmd__ = ['b封面/B封面']
-__plugin_type__ = ('一些工具',)
+""".strip()
+__plugin_des__ = "快捷的b站视频封面获取方式"
+__plugin_cmd__ = ["b封面/B封面"]
+__plugin_type__ = ("一些工具",)
 __plugin_version__ = 0.1
-__plugin_author__ = 'HibiKier'
+__plugin_author__ = "HibiKier"
 __plugin_settings__ = {
     "level": 5,
     "default_status": True,
     "limit_superuser": False,
-    "cmd": ["b封面", 'B封面'],
+    "cmd": ["b封面", "B封面"],
 }
 
 
-cover = on_command('b封面', aliases={'B封面'}, priority=5, block=True)
+cover = on_command("b封面", aliases={"B封面"}, priority=5, block=True)
 
 
-cover_url = 'https://v2.alapi.cn/api/bilibili/cover'
+cover_url = "https://v2.alapi.cn/api/bilibili/cover"
 
 
 @cover.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     msg = get_message_text(event.json())
-    params = {
-        'token': ALAPI_TOKEN,
-        'c': msg
-    }
+    params = {"c": msg}
     data, code = await get_data(cover_url, params)
     if code != 200:
         await cover.finish(data, at_sender=True)
-    data = data['data']
-    title = data['title']
-    img = data['cover']
-    await cover.send(Message(f'title：{title}\n{image(img)}'))
+    data = data["data"]
+    title = data["title"]
+    img = data["cover"]
+    await cover.send(Message(f"title：{title}\n{image(img)}"))
     logger.info(
         f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-        f" 获取b站封面: {title} url：{img}")
-
-
-
+        f" 获取b站封面: {title} url：{img}"
+    )

plugins/alapi/data_source.py

@@ -2,21 +2,23 @@ from nonebot.adapters.cqhttp import MessageSegment
 from utils.image_utils import CreateImg
 from utils.message_builder import image
 from configs.path_config import IMAGE_PATH
-from typing import Union
+from typing import Optional
+from configs.config import Config
 import aiohttp
 
 
-async def get_data(url: str, params: dict) -> 'Union[dict, str], int':
+async def get_data(url: str, params: Optional[dict] = None) -> "Union[dict, str], int":
     """
     获取ALAPI数据
     :param url: 请求链接
     :param params: 参数
     """
+    if not params:
+        params = {}
+    params["token"] = Config.get_config("alapi", "ALAPI_TOKEN")
     async with aiohttp.ClientSession() as session:
         try:
-            async with session.get(
-                url, timeout=2, params=params
-            ) as response:
+            async with session.get(url, timeout=2, params=params) as response:
                 data = await response.json()
                 if data["code"] == 200:
                     if not data["data"]:
@@ -33,13 +35,13 @@ def gen_wbtop_pic(data: dict) -> MessageSegment:
     生成微博热搜图片
     :param data: 微博热搜数据
     """
-    bk = CreateImg(700, 32 * 50 + 280, 700, 32, color='#797979')
-    wbtop_bk = CreateImg(700, 280, background=f'{IMAGE_PATH}/other/webtop.png')
+    bk = CreateImg(700, 32 * 50 + 280, 700, 32, color="#797979")
+    wbtop_bk = CreateImg(700, 280, background=f"{IMAGE_PATH}/other/webtop.png")
     bk.paste(wbtop_bk)
-    text_bk = CreateImg(700, 32 * 50, 700, 32, color='#797979')
+    text_bk = CreateImg(700, 32 * 50, 700, 32, color="#797979")
     for i, data in enumerate(data):
         title = f"{i+1}. {data['hot_word']}"
-        hot = data['hot_word_num']
+        hot = data["hot_word_num"]
         img = CreateImg(700, 30, font_size=20)
         w, h = img.getsize(title)
         img.text((10, int((30 - h) / 2)), title)

plugins/alapi/poetry.py

@@ -1,48 +1,42 @@
 from nonebot import on_command
 from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
 from nonebot.typing import T_State
-from configs.config import ALAPI_TOKEN
 from services.log import logger
 from .data_source import get_data
 
-__zx_plugin_name__ = '古诗'
+__zx_plugin_name__ = "古诗"
 __plugin_usage__ = """usage：
     平白无故念首诗
     示例：念诗/来首诗/念首诗
 """
-__plugin_des__ = '为什么突然文艺起来了！'
-__plugin_cmd__ = ['念诗/来首诗/念首诗']
+__plugin_des__ = "为什么突然文艺起来了！"
+__plugin_cmd__ = ["念诗/来首诗/念首诗"]
 __plugin_version__ = 0.1
-__plugin_author__ = 'HibiKier'
+__plugin_author__ = "HibiKier"
 __plugin_settings__ = {
     "level": 5,
     "default_status": True,
     "limit_superuser": False,
-    "cmd": ['念诗', '来首诗', '念首诗'],
+    "cmd": ["念诗", "来首诗", "念首诗"],
 }
 
-poetry = on_command("念诗", aliases={'来首诗', '念首诗'}, priority=5, block=True)
+poetry = on_command("念诗", aliases={"来首诗", "念首诗"}, priority=5, block=True)
 
 
-poetry_url = 'https://v2.alapi.cn/api/shici'
+poetry_url = "https://v2.alapi.cn/api/shici"
 
 
 @poetry.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
-    params = {
-        'token': ALAPI_TOKEN
-    }
-    data, code = await get_data(poetry_url, params)
+    data, code = await get_data(poetry_url)
     if code != 200:
         await poetry.finish(data, at_sender=True)
-    data = data['data']
-    content = data['content']
-    title = data['origin']
-    author = data['author']
-    await poetry.send(f'{content}\n\t——{author}《{title}》')
+    data = data["data"]
+    content = data["content"]
+    title = data["origin"]
+    author = data["author"]
+    await poetry.send(f"{content}\n\t——{author}《{title}》")
     logger.info(
         f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-        f" 发送古诗: f'{content}\n\t--{author}《{title}》'")
-
-
-
+        f" 发送古诗: f'{content}\n\t--{author}《{title}》'"
+    )

plugins/alapi/wbtop.py

@@ -1,7 +1,6 @@
 from nonebot import on_command
 from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
 from nonebot.typing import T_State
-from configs.config import ALAPI_TOKEN
 from services.log import logger
 from .data_source import get_data, gen_wbtop_pic
 from utils.browser import get_browser
@@ -43,10 +42,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     global wbtop_data
     msg = get_message_text(event.json())
     if not wbtop_data or not msg:
-        params = {
-            'token': ALAPI_TOKEN
-        }
-        data, code = await get_data(wbtop_url, params)
+        data, code = await get_data(wbtop_url)
         if code != 200:
             await wbtop.finish(data, at_sender=True)
         wbtop_data = data['data']
@@ -67,6 +63,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
             page = await browser.new_page()
             await page.goto(url, wait_until='networkidle', timeout=10000)
             await page.set_viewport_size({"width": 2560, "height": 1080})
+            await asyncio.sleep(5)
             div = await page.query_selector("#pl_feedlist_index")
             await div.screenshot(path=f'{IMAGE_PATH}/temp/wbtop_{event.user_id}.png', timeout=100000)
             await page.close()