Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'HibiKier:main' into main

Browse Source
This commit is contained in:
yajiwa 2022-07-24 18:51:09 +08:00 committed by GitHub
commit e4f2b761d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -247,6 +247,10 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能
## 更新 ## 更新
### 2022/7/24
* 订阅up动态提供直链
### 2022/7/23 ### 2022/7/23
* 优化开箱次数判断 * 优化开箱次数判断

9
plugins/bilibili_sub/data_source.py
View File

@ -256,14 +256,14 @@ async def _get_up_status(id_: int) -> Optional[str]:
video = None video = None
if _user.uname != uname: if _user.uname != uname:
await BilibiliSub.update_sub_info(id_, 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"): if video_info["list"].get("vlist"):
video = video_info["list"]["vlist"][0] video = video_info["list"]["vlist"][0]
latest_video_created = video["created"] latest_video_created = video["created"]
rst = "" rst = ""
if dynamic_img: if dynamic_img:
await BilibiliSub.update_sub_info(id_, dynamic_upload_time=dynamic_upload_time) 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 ( if (
latest_video_created latest_video_created
and _user.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( async def get_user_dynamic(
uid: int, local_user: BilibiliSub uid: int, local_user: BilibiliSub
) -> Tuple[Optional[MessageSegment], int]: ) -> Tuple[Optional[MessageSegment], int, str]:
""" """
获取用户动态 获取用户动态
:param uid: 用户uid :param uid: 用户uid
@ -372,8 +372,9 @@ async def get_user_dynamic(
"bilibili_sub/dynamic", "bilibili_sub/dynamic",
), ),
dynamic_upload_time, dynamic_upload_time,
f"https://t.bilibili.com/{dynamic_id}"
) )
return None, 0 return None, 0, ''
class SubManager: class SubManager:

68
plugins/word_bank/__init__.py
View File

@ -1,34 +1,34 @@
# from configs.config import Config from configs.config import Config
# import nonebot import nonebot
#
# Config.add_plugin_config( Config.add_plugin_config(
# "word_bank", "word_bank",
# "WORD_BANK_LEVEL [LEVEL]", "WORD_BANK_LEVEL [LEVEL]",
# 5, 5,
# name="词库问答", name="词库问答",
# help_="设置增删词库的权限等级", help_="设置增删词库的权限等级",
# default_value=5 default_value=5
# ) )
#
# Config.add_plugin_config( Config.add_plugin_config(
# "word_bank", "word_bank",
# "WORD_BANK_FUZZY", "WORD_BANK_FUZZY",
# False, False,
# help_="模糊匹配", help_="模糊匹配",
# default_value=False default_value=False
# ) )
# Config.add_plugin_config( Config.add_plugin_config(
# "word_bank", "word_bank",
# "WORD_BANK_KEY", "WORD_BANK_KEY",
# True, True,
# help_="关键字匹配", help_="关键字匹配",
# default_value=True default_value=True
# ) )
# Config.add_plugin_config( Config.add_plugin_config(
# "word_bank", "word_bank",
# "WORD_BANK_MIX", "WORD_BANK_MIX",
# 25, 25,
# help_="查看词条时图片内最多显示条数", help_="查看词条时图片内最多显示条数",
# default_value=25 default_value=25
# ) )
# nonebot.load_plugins("plugins/word_bank") nonebot.load_plugins("plugins/word_bank")