Merge branch 'HibiKier:main' into main

README.md

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

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:

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")