From dadeb4006ee1ef9536853e6e56818f7de06015d8 Mon Sep 17 00:00:00 2001 From: HibiKier <45528451+HibiKier@users.noreply.github.com> Date: Sun, 24 Jul 2022 01:19:47 +0800 Subject: [PATCH 1/2] Update __init__.py --- plugins/word_bank/__init__.py | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/plugins/word_bank/__init__.py b/plugins/word_bank/__init__.py index 323682e9..3e8535db 100644 --- a/plugins/word_bank/__init__.py +++ b/plugins/word_bank/__init__.py @@ -1,34 +1,34 @@ -# from configs.config import Config -# import nonebot -# -# Config.add_plugin_config( -# "word_bank", -# "WORD_BANK_LEVEL [LEVEL]", -# 5, -# name="词库问答", -# help_="设置增删词库的权限等级", -# default_value=5 -# ) -# -# Config.add_plugin_config( -# "word_bank", -# "WORD_BANK_FUZZY", -# False, -# help_="模糊匹配", -# default_value=False -# ) -# Config.add_plugin_config( -# "word_bank", -# "WORD_BANK_KEY", -# True, -# help_="关键字匹配", -# default_value=True -# ) -# Config.add_plugin_config( -# "word_bank", -# "WORD_BANK_MIX", -# 25, -# help_="查看词条时图片内最多显示条数", -# default_value=25 -# ) -# nonebot.load_plugins("plugins/word_bank") +from configs.config import Config +import nonebot + +Config.add_plugin_config( + "word_bank", + "WORD_BANK_LEVEL [LEVEL]", + 5, + name="词库问答", + help_="设置增删词库的权限等级", + default_value=5 +) + +Config.add_plugin_config( + "word_bank", + "WORD_BANK_FUZZY", + False, + help_="模糊匹配", + default_value=False +) +Config.add_plugin_config( + "word_bank", + "WORD_BANK_KEY", + True, + help_="关键字匹配", + default_value=True +) +Config.add_plugin_config( + "word_bank", + "WORD_BANK_MIX", + 25, + help_="查看词条时图片内最多显示条数", + default_value=25 +) +nonebot.load_plugins("plugins/word_bank") From 6ff6009a70362dcabfa049661c25d6434d283be4 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Sun, 24 Jul 2022 02:54:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?b=E7=AB=99=E8=AE=A2=E9=98=85up=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=8F=90=E4=BE=9B=E7=9B=B4=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ plugins/bilibili_sub/data_source.py | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index de496575..e5e4ec2e 100644 --- a/README.md +++ b/README.md @@ -247,6 +247,10 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能 ## 更新 +### 2022/7/24 + +* 订阅up动态提供直链 + ### 2022/7/23 * 优化开箱次数判断 diff --git a/plugins/bilibili_sub/data_source.py b/plugins/bilibili_sub/data_source.py index a1ca3fb8..b2d074dd 100755 --- a/plugins/bilibili_sub/data_source.py +++ b/plugins/bilibili_sub/data_source.py @@ -256,14 +256,14 @@ async def _get_up_status(id_: int) -> Optional[str]: video = None if _user.uname != uname: await BilibiliSub.update_sub_info(id_, uname=uname) - dynamic_img, dynamic_upload_time = await get_user_dynamic(id_, _user) + dynamic_img, dynamic_upload_time, link = await get_user_dynamic(id_, _user) if video_info["list"].get("vlist"): video = video_info["list"]["vlist"][0] latest_video_created = video["created"] rst = "" if dynamic_img: await BilibiliSub.update_sub_info(id_, dynamic_upload_time=dynamic_upload_time) - rst += f"{uname} 发布了动态!\n" f"{dynamic_img}\n" + rst += f"{uname} 发布了动态!\n" f"{dynamic_img}\n{link}" if ( latest_video_created and _user.latest_video_created @@ -309,7 +309,7 @@ async def _get_season_status(id_) -> Optional[str]: async def get_user_dynamic( uid: int, local_user: BilibiliSub -) -> Tuple[Optional[MessageSegment], int]: +) -> Tuple[Optional[MessageSegment], int, str]: """ 获取用户动态 :param uid: 用户uid @@ -372,8 +372,9 @@ async def get_user_dynamic( "bilibili_sub/dynamic", ), dynamic_upload_time, + f"https://t.bilibili.com/{dynamic_id}" ) - return None, 0 + return None, 0, '' class SubManager: