yz-yuki-plugin 1.0.4 → 2.0.2-1

package/CHANGELOG.md

@@ -1,22 +1,32 @@
-# 1.0.4
+# 2.0.2
+* fix DYNAMIC_TYPE_ARTICLE
+* 优化Next npm包插件 Task加载
+
+# 2.0.1
+* 规范版本号
+* 调整渲染出图类型为webp格式，减小发送图片消息带宽压力
+
+# 2.0.0
 * 优化代码，npm 包增加 typescript 类型定义文件
 * 统一配置文件目录：yunzai/data/yuki-plugin/config/，更新后如需使用旧配置文件，请自行移动旧配置文件到新目录
+
+# 1.4.0
 * 优化哔哩登录日志
 * 优化渲染
 * 增加哔哩 MAJOR_TYPE_DRAW MAJOR_TYPE_ARTICLE 动态子类型
 
-# 1.0.3
+# 1.3.0
 * 修复群组与好友动态推送混淆问题
 * 更新获取B站up信息api
 * 优化动态字体样式
 * 优化文字动态内容排版
 * 修复转发动态内容缺失
 
-# 1.0.2
+# 1.2.0
 * 新增支持获取完整文章动态内容
 * 修复宫格样式
 
-# 1.0.1
+# 1.1.0
 * 修复了一些bug
 * 优化了一些功能
 * 新增 Yunzai-v4.1 npm包方式安装支持，yarn add yz-yuki-plugin -W

package/README.md

@@ -21,12 +21,12 @@
 >```
 接着修改 `yunzaijs/yunzai.config.js`，按版本选择修改方式：
 
-Yunzai-Next v4.1.28+及以上版本：
+Yunzai-Next v4.1.33+及以上版本：
 ```js
 import { defineConfig } from 'yunzai'
 export default defineConfig({
   applications: ['yz-system', 'yz-yuki-plugin'], //该行添加 'yz-yuki-plugin'
-  middlewares: ['yz-mw-runtime', 'yunzai-mys/mw']
+  middlewares: ['yunzai-mys/runtime', 'yunzai-mys/message']
 })
 ```
 
@@ -75,6 +75,12 @@ pnpm install --filter=yuki-plugin
 ```
 
 ## 📦插件配置
+
+> [!IMPORTANT] 
+> 统一的配置文件路径：
+
+`Yunzai/data/yuki-plugin/config/`，启动一次后，即可查看配置文件。
+
 ### 1.B站动态功能：
  使用建议先绑定B站账号或配置cookie，绑定后即可使用相关功能。
 
@@ -127,11 +133,6 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 
 <details><summary>点击展开</summary>
 
-> [!IMPORTANT] 
-> 统一的配置文件路径：
-
-`Yunzai/data/yuki-plugin/config/`，启动一次后，即可查看配置文件。
-
 > [!TIP]
 > 指令前缀：`#优纪`、`#yuki`、`/优纪`、`/yuki`，
 

package/lib/apps/bilibili.js

@@ -1,6 +1,6 @@
 import JSON from 'json5';
 import lodash from 'lodash';
-import { Messages, setBotTask, Bot, Redis } from 'yunzai';
+import { Messages, Bot, Redis } from 'yunzai';
 import { BiliQuery } from '../models/bilibili/bilibili.query.js';
 import { BiliTask } from '../models/bilibili/bilibili.task.js';
 import Config from '../utils/config.js';
@@ -8,49 +8,47 @@ import { BiliGetWebData } from '../models/bilibili/bilibili.get.web.data.js';
 import { applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, readTempCk } from '../models/bilibili/bilibili.models.js';
 
 const message = new Messages('message');
-let biliConfigData = Config.getConfigData("config", "bilibili", "config");
 let biliPushData = Config.getConfigData("config", "bilibili", "push");
-setBotTask(async (Bot) => {
-    try {
-        newPushTask();
-        if (biliConfigData.pushTaskLog) {
-            Bot.logger.mark("yuki插件---B站动态推送定时任务");
-        }
-    }
-    catch (err) {
-        console.error('B站动态推送定时任务', err);
-    }
-}, biliConfigData.pushStatus ? biliConfigData.pushTime : "");
-async function newPushTask(e) {
+/** 推送任务 函数 */
+async function biliNewPushTask(e) {
     await new BiliTask(e).runTask();
 }
+/**B站动态推送 */
 message.use(async (e) => {
-    await newPushTask(e);
+    await biliNewPushTask(e);
 }, [/^(#|\/)(yuki|优纪)?执行(b站|B站|bili|bilibili|哔哩|哔哩哔哩)任务$/]);
+/** 添加B站动态订阅 */
 message.use(async (e) => {
     if (!e.isMaster) {
         e.reply("未取得bot主人身份，无权限添加B站动态订阅");
     }
     else {
+        // 从消息中提取UID
         const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim().replace(/^(uid|UID)?(:|：)?/g, '');
         if (!uid) {
             e.reply(`请在指令末尾指定订阅的B站up主的UID！`);
             return true;
         }
+        // 获取或初始化推送数据
         let subData = biliPushData || { group: {}, private: {} };
+        // 根据聊天类型初始化数据
         let chatType = e.isGroup ? "group" : "private";
         let chatId = e.isGroup ? e.group_id : e.user_id;
+        // 初始化群组或私聊数据
         if (!subData[chatType][chatId]) {
             subData[chatType][chatId] = [];
         }
+        // 检查该 uid 是否已存在
         const upData = subData[chatType][chatId].find((item) => item.uid === uid);
         if (upData) {
+            // 更新推送类型
             upData.type = BiliQuery.typeHandle(upData, e.msg, "add");
             biliPushData = subData;
             Config.saveConfig("config", "bilibili", "push", subData);
             e.reply(`修改b站推送动态类型成功~\n${upData.name}：${uid}`);
             return;
         }
+        // 获取 Bilibili 动态信息
         const res = await new BiliGetWebData(e).getBiliDynamicListDataByUid(uid);
         if (res.statusText !== "OK") {
             e.reply("出了点网络问题，等会再试试吧~");
@@ -76,8 +74,9 @@ message.use(async (e) => {
         else {
             name = uid;
         }
+        // 添加新的推送数据
         subData[chatType][chatId].push({
-            bot_id: e.self_id,
+            bot_id: e.self_id, // 使用 bot_id， 对应 e_self_id
             uid,
             name: name,
             type: BiliQuery.typeHandle({ uid, name }, e.msg, "add"),
@@ -87,30 +86,38 @@ message.use(async (e) => {
         e.reply(`添加b站推送成功~\n${name}：${uid}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*.*$/]);
+/** 删除B站动态订阅 */
 message.use(async (e) => {
     if (!e.isMaster) {
         e.reply("未取得bot主人身份，无权限删除B站动态订阅");
     }
     else {
+        // 提取用户输入的UID
         const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim().replace(/^(uid|UID)?(:|：)?/g, '');
         if (!uid) {
             e.reply(`请在指令末尾指定订阅的B站up主的UID！`);
             return;
         }
+        // 获取或初始化B站推送数据
         let subData = Config.getConfigData("config", "bilibili", "push") || { group: {}, private: {} };
+        // 根据聊天类型初始化数据
         let chatType = e.isGroup ? "group" : "private";
         let chatId = e.isGroup ? e.group_id : e.user_id;
+        // 初始化群组或私聊数据
         if (!subData[chatType][chatId]) {
             subData[chatType][chatId] = [];
         }
+        // 查找指定UID的订阅数据
         const upData = subData[chatType][chatId].find((item) => item.uid == uid);
         if (!upData) {
             e.reply(`订阅列表中没有找到该UID~\n${uid}可能是无效的`);
             return;
         }
+        // 处理订阅类型
         const newType = BiliQuery.typeHandle(upData, e.msg, "del");
         let isDel = false;
         if (newType.length) {
+            // 更新订阅类型
             subData[chatType][chatId] = subData[chatType][chatId].map((item) => {
                 if (item.uid == uid) {
                     item.type = newType;
@@ -119,23 +126,31 @@ message.use(async (e) => {
             });
         }
         else {
+            // 删除订阅
             isDel = true;
             subData[chatType][chatId] = subData[chatType][chatId].filter((item) => item.uid !== uid);
         }
+        // 保存更新后的数据
+        //biliPushData = subData;
         Config.saveConfig("config", "bilibili", "push", subData);
+        // 回复用户操作结果
         e.reply(`${isDel ? "删除" : "修改"}b站推送成功~\n${uid}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*.*$/]);
+/** 扫码登录B站 */
 message.use(async (e) => {
     if (e.isMaster) {
         try {
             const token = await applyLoginQRCode(e);
             let biliLoginCk = await pollLoginQRCode(e, token);
+            //let _uuid = readSavedCookieItems(biliLoginCk, ['_uuid'])
+            //const buvid_fp = await get_buvid_fp(_uuid);
+            //biliLoginCk = buvid_fp + biliLoginCk;
             if (lodash.trim(biliLoginCk).length != 0) {
                 await saveLoginCookie(e, biliLoginCk);
                 e.reply(`get bilibili LoginCk：成功！`);
-                const result = await postGateway(biliLoginCk);
-                const { code, data } = await result.data;
+                const result = await postGateway(biliLoginCk); //激活ck
+                const { code, data } = await result.data; // 解析校验结果
                 switch (code) {
                     case 0:
                         (logger ?? Bot.logger)?.mark(`优纪插件：获取biliLoginCK，Gateway校验成功：${JSON.stringify(data)}`);
@@ -157,6 +172,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限配置B站登录ck");
     }
 }, [/^(#|\/)(yuki|优纪)?(扫码|添加|ADD|add)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)登录$/]);
+/** 删除登陆的B站ck */
 message.use(async (e) => {
     if (e.isMaster) {
         await exitBiliLogin(e);
@@ -167,6 +183,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限删除B站登录ck");
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)登录$/]);
+/** 显示我的B站登录信息 */
 message.use(async (e) => {
     if (e.isMaster) {
         await checkBiliLogin(e);
@@ -175,6 +192,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限查看B站登录状态");
     }
 }, [/^(#|\/)(yuki|优纪)?我的(b站|B站|bili|bilibili|哔哩|哔哩哔哩)登录$/]);
+/** 手动绑定本地获取的B站cookie */
 message.use(async (e) => {
     if (e.isMaster) {
         if (e.isPrivate) {
@@ -184,6 +202,7 @@ message.use(async (e) => {
             let localBiliCookie = e.msg.replace(/^(#|\/)(yuki|优纪)?(绑定|添加|ADD|add)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(ck|CK|cookie|COOKIE)(:|：)?/g, "").trim();
             let param = {};
             localBiliCookie.split(';').forEach((v) => {
+                // 处理分割特殊cookie_token
                 let tmp = lodash.trim(v).replace('=', '$').split('$');
                 param[tmp[0]] = tmp[1];
             });
@@ -207,13 +226,16 @@ message.use(async (e) => {
                 }
                 return;
             }
+            //筛选ck
             localBiliCookie = await readSavedCookieItems(localBiliCookie, ['buvid3', 'buvid4', '_uuid', 'SESSDATA', 'DedeUserID', 'DedeUserID__ckMd5', 'bili_jct', 'b_nut', 'b_lsid'], false);
+            //const buvid_fp = await get_buvid_fp(param._uuid)
+            //localBiliCookie = buvid_fp + localBiliCookie; //添加buvid_fp值
             await saveLocalBiliCk(localBiliCookie);
             logger.mark(`${e.logFnc} 保存B站cookie成功 [UID:${param.DedeUserID}]`);
             let uidMsg = [`好耶~绑定B站cookie成功：\n${param.DedeUserID}`];
             await e.reply(uidMsg);
-            const result = await postGateway(localBiliCookie);
-            const { code, data } = await result.data;
+            const result = await postGateway(localBiliCookie); //激活ck
+            const { code, data } = await result.data; // 解析校验结果
             switch (code) {
                 case 0:
                     (logger ?? Bot.logger)?.mark(`优纪插件：绑定localCK，Gateway校验成功：${JSON.stringify(data)}`);
@@ -228,6 +250,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限配置B站登录ck");
     }
 }, [/^^(#|\/)(yuki|优纪)?(绑定|添加|ADD|add)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)本地(ck|CK|cookie|COOKIE)(:|：)?.*$/]);
+/** 删除绑定的本地B站ck */
 message.use(async (e) => {
     if (e.isMaster) {
         await saveLocalBiliCk("");
@@ -237,6 +260,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限删除B站登录ck");
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)本地(ck|CK|cookie|COOKIE)$/]);
+/** 当前正在使用的B站ck */
 message.use(async (e) => {
     if (e.isGroup) {
         await e.reply('注意账号安全，请私聊查看叭');
@@ -265,6 +289,7 @@ message.use(async (e) => {
         }
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)本地(ck|CK|cookie|COOKIE)$/]);
+/** 删除并刷新redis缓存的临时B站ck */
 message.use(async (e) => {
     try {
         await getNewTempCk();
@@ -281,6 +306,7 @@ message.use(async (e) => {
         (logger ?? Bot.logger)?.mark(`优纪插件：B站临时ck刷新error：${error}`);
     }
 }, [/^(#|\/)(yuki|优纪)?刷新(b站|B站|bili|bilibili|哔哩|哔哩哔哩)临时(ck|CK|cookie|COOKIE)$/]);
+/** 订阅的全部b站推送列表 */
 message.use(async (e) => {
     if (!e.isMaster) {
         e.reply("未取得bot主人身份，无权限查看Bot的全部B站订阅列表");
@@ -296,6 +322,7 @@ message.use(async (e) => {
             DYNAMIC_TYPE_FORWARD: "转发",
             DYNAMIC_TYPE_LIVE_RCMD: "直播",
         };
+        // 处理群组订阅
         if (subData.group && Object.keys(subData.group).length > 0) {
             messages.push("------群组B站订阅------\n");
             Object.keys(subData.group).forEach((groupId) => {
@@ -313,6 +340,7 @@ message.use(async (e) => {
                 });
             });
         }
+        // 处理私聊订阅
         if (subData.private && Object.keys(subData.private).length > 0) {
             messages.push("\n------私聊B站订阅------");
             Object.keys(subData.private).forEach((userId) => {
@@ -333,6 +361,7 @@ message.use(async (e) => {
         e.reply(`推送列表如下：\n${messages.join("\n")}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)全部(推送|动态|订阅)列表$/]);
+/** 单独群聊或私聊的订阅的b站推送列表 */
 message.use(async (e) => {
     let subData = Config.getConfigData("config", "bilibili", "push") || { group: {}, private: {} };
     const messages = [];
@@ -344,6 +373,7 @@ message.use(async (e) => {
         DYNAMIC_TYPE_FORWARD: "转发",
         DYNAMIC_TYPE_LIVE_RCMD: "直播",
     };
+    // 根据聊天类型初始化数据
     let chatType = e.isGroup ? "group" : "private";
     let chatId = e.isGroup ? e.group_id : e.user_id;
     if (!subData[chatType][chatId]) {
@@ -362,6 +392,7 @@ message.use(async (e) => {
     });
     e.reply(`推送列表如下：\n${messages.join("\n")}`);
 }, [/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(推送|动态|订阅)列表$/]);
+/**通过uid获取up主信息 */
 message.use(async (e) => {
     let uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主/g, "").trim();
     const res = await new BiliGetWebData(e).getBilibiUserInfoByUid(uid);
@@ -393,6 +424,7 @@ message.use(async (e) => {
     }
     e.reply(message);
 }, [/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主.*$/]);
+/** 根据名称搜索up的uid*/
 message.use(async (e) => {
     let keyword = e.msg.replace(/^(#|\/)(yuki|优纪)?搜索(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主/g, "").trim();
     const res = await new BiliGetWebData(e).searchBiliUserInfoByKeyword(keyword);

package/lib/apps/help.js

@@ -3,6 +3,9 @@ import Image from '../utils/image.js';
 import Help from '../models/help/help.js';
 
 const message = new Messages('message');
+/**
+ * 优纪帮助
+ */
 message.use(async (e) => {
     const helpData = await Help.get();
     const renderData = {
@@ -16,6 +19,10 @@ message.use(async (e) => {
         }))
     };
     const ScreenshotOptionsData = {
+        SOptions: {
+            type: 'webp',
+            quality: 90,
+        },
         isSplit: false,
         modelName: 'yukiHelp',
     };

package/lib/apps/version.js

@@ -3,6 +3,9 @@ import Image from '../utils/image.js';
 import VersionData from '../models/version/version.js';
 
 const message = new Messages('message');
+/**
+ * 优纪版本
+ */
 message.use(async (e) => {
     const version = new VersionData;
     const versionData = await version.getChangelogContent();
@@ -13,6 +16,10 @@ message.use(async (e) => {
         }))
     };
     const ScreenshotOptionsData = {
+        SOptions: {
+            type: 'webp',
+            quality: 90,
+        },
         isSplit: false,
         modelName: 'yukiVersion',
     };

package/lib/apps/weibo.js

@@ -1,53 +1,51 @@
-import { Messages, setBotTask } from 'yunzai';
+import { Messages } from 'yunzai';
 import { WeiboQuery } from '../models/weibo/weibo.query.js';
 import { WeiboTask } from '../models/weibo/weibo.task.js';
 import Config from '../utils/config.js';
 import { WeiboGetWebData } from '../models/weibo/weibo.get.web.data.js';
 
 const message = new Messages('message');
-let weiboConfigData = Config.getConfigData("config", "weibo", "config");
 let weiboPushData = Config.getConfigData("config", "weibo", "push");
-setBotTask(async (Bot) => {
-    try {
-        await newPushTask();
-        if (weiboConfigData.pushTaskLog) {
-            Bot.logger.mark("yuki插件---微博动态推送定时任务");
-        }
-    }
-    catch (err) {
-        console.error('微博动态推送定时任务', err);
-    }
-}, weiboConfigData.pushStatus ? weiboConfigData.pushTime : "");
-async function newPushTask(e) {
+/** 定义 动态任务 函数 */
+async function weiboNewPushTask(e) {
     await new WeiboTask(e).runTask();
 }
+/**微博动态推送 */
 message.use(async (e) => {
-    await newPushTask(e);
+    await weiboNewPushTask(e);
 }, [/^(#|\/)(yuki|优纪)?执行(微博|weibo|WEIBO)任务$/]);
+/** 添加微博动态订阅 */
 message.use(async (e) => {
     if (!e.isMaster) {
         e.reply("未取得bot主人身份，无权限添加微博动态订阅");
     }
     else {
+        // 从消息中提取UID
         const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(微博|weibo|WEIBO)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*)*/g, "").trim();
         if (!uid) {
             e.reply(`请在指令末尾指定订阅的微博博主的UID！`);
             return true;
         }
+        // 获取或初始化推送数据
         let subData = weiboPushData || { group: {}, private: {} };
+        // 根据聊天类型初始化数据
         let chatType = e.isGroup ? "group" : "private";
         let chatId = e.isGroup ? e.group_id : e.user_id;
+        // 初始化群组或私聊数据
         if (!subData[chatType][chatId]) {
             subData[chatType][chatId] = [];
         }
+        // 检查该 uid 是否已存在
         const upData = subData[chatType][chatId].find((item) => item.uid === uid);
         if (upData) {
+            // 更新推送类型
             upData.type = WeiboQuery.typeHandle(upData, e.msg, "add");
             weiboPushData = subData;
             Config.saveConfig("config", "weibo", "push", subData);
             e.reply(`修改微博推送动态类型成功~\n${upData.name}：${uid}`);
             return;
         }
+        // 获取 微博 博主信息
         const res = await new WeiboGetWebData(e).getBloggerInfo(uid);
         if (res.statusText !== "OK") {
             e.reply("出了点网络问题，等会再试试吧~");
@@ -63,8 +61,9 @@ message.use(async (e) => {
         if (userInfo && (userInfo.length !== 0)) {
             name = userInfo.screen_name || uid;
         }
+        // 添加新的推送数据
         subData[chatType][chatId].push({
-            bot_id: e?.self_id,
+            bot_id: e?.self_id, // 使用 bot_id 对应 e_self_id
             uid,
             name: name,
             type: WeiboQuery.typeHandle({ uid, name }, e.msg, "add"),
@@ -74,30 +73,38 @@ message.use(async (e) => {
         e.reply(`添加微博推送成功~\n${name}：${uid}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(微博|weibo|WEIBO)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*)*.*$/]);
+/** 删除微博动态订阅 */
 message.use(async (e) => {
     if (!e.isMaster) {
         e.reply("未取得bot主人身份，无权限删除微博动态订阅");
     }
     else {
+        // 提取用户输入的UID
         const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(微博|weibo|WEIBO)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*)*/g, "").trim();
         if (!uid) {
             e.reply(`请在指令末尾指定订阅的微博博主的UID！`);
             return;
         }
+        // 获取或初始化微博推送数据
         let data = weiboPushData || { group: {}, private: {} };
+        // 根据聊天类型初始化数据
         let chatType = e.isGroup ? "group" : "private";
         let chatId = e.isGroup ? e.group_id : e.user_id;
+        // 初始化群组或私聊数据
         if (!data[chatType][chatId]) {
             data[chatType][chatId] = [];
         }
+        // 查找指定UID的订阅数据
         const upData = data[chatType][chatId].find((item) => item.uid == uid);
         if (!upData) {
             e.reply(`订阅列表中没有找到该UID~\n${uid}可能是无效的`);
             return;
         }
+        // 处理订阅类型
         const newType = WeiboQuery.typeHandle(upData, e.msg, "del");
         let isDel = false;
         if (newType.length) {
+            // 更新订阅类型
             data[chatType][chatId] = data[chatType][chatId].map((item) => {
                 if (item.uid == uid) {
                     item.type = newType;
@@ -106,13 +113,18 @@ message.use(async (e) => {
             });
         }
         else {
+            // 删除订阅
             isDel = true;
             data[chatType][chatId] = data[chatType][chatId].filter((item) => item.uid !== uid);
         }
+        // 保存更新后的数据
+        //weiboPushData = data;
         Config.saveConfig("config", "weibo", "push", data);
+        // 回复用户操作结果
         e.reply(`${isDel ? "删除" : "修改"}微博推送成功~\n${uid}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(微博|weibo|WEIBO)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*)*.*$/]);
+/** 订阅的全部微博推送列表 */
 message.use(async (e) => {
     if (!e.isMaster) {
         e.reply("未取得bot主人身份，无权限查看Bot的全部微博推送列表");
@@ -127,6 +139,7 @@ message.use(async (e) => {
             DYNAMIC_TYPE_ARTICLE: "文章",
             DYNAMIC_TYPE_FORWARD: "转发",
         };
+        // 处理群组订阅
         if (subData.group && Object.keys(subData.group).length > 0) {
             messages.push("------群组微博订阅------");
             Object.keys(subData.group).forEach((groupId) => {
@@ -144,6 +157,7 @@ message.use(async (e) => {
                 });
             });
         }
+        // 处理私聊订阅
         if (subData.private && Object.keys(subData.private).length > 0) {
             messages.push("------私聊微博订阅------");
             Object.keys(subData.private).forEach((userId) => {
@@ -164,6 +178,7 @@ message.use(async (e) => {
         e.reply(`推送列表如下：\n${messages.join("\n")}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)全部(推送|动态|订阅)列表$/]);
+/** 单独群聊或私聊的订阅的b站推送列表 */
 message.use(async (e) => {
     let subData = weiboPushData || { group: {}, private: {} };
     const messages = [];
@@ -174,6 +189,7 @@ message.use(async (e) => {
         DYNAMIC_TYPE_ARTICLE: "文章",
         DYNAMIC_TYPE_FORWARD: "转发",
     };
+    // 根据聊天类型初始化数据
     let chatType = e.isGroup ? "group" : "private";
     let chatId = e.isGroup ? e.group_id : e.user_id;
     if (!subData[chatType][chatId]) {
@@ -192,6 +208,7 @@ message.use(async (e) => {
     });
     e.reply(`推送列表如下：\n${messages.join("\n")}`);
 }, [/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)(推送|动态|订阅)列表$/]);
+/**通过uid获取up主信息 */
 message.use(async (e) => {
     let uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)(博|bo|BO)主/g, "").trim();
     const res = await new WeiboGetWebData(e).getBloggerInfo(uid);
@@ -220,6 +237,7 @@ message.use(async (e) => {
     ];
     e.reply(message);
 }, [/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)(博|bo|BO)主.*$/]);
+/** 根据昵称搜索博主信息*/
 message.use(async (e) => {
     let keyword = e.msg.replace(/^(#|\/)(yuki|优纪)?搜索(微博|weibo|WEIBO)(博|bo|BO)主/g, "").trim();
     const res = await new WeiboGetWebData(e).searchBloggerInfo(keyword);

package/lib/components/dynamic/Account.js

@@ -2,6 +2,8 @@ import React from 'react';
 import LogoText from './LogoText.js';
 import { createRequire } from 'react-puppeteer';
 
+// Account
+// up账户组件
 const require = createRequire(import.meta.url);
 const bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');
 const weibilogo = require('./../../../resources/img/icon/dynamic/weibo.svg');

package/lib/components/dynamic/Content.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { createRequire } from 'react-puppeteer';
 
+// DynamicContent.tsx
 const require = createRequire(import.meta.url);
 const Content = ({ data }) => {
     const picItems = data.pics && (React.createElement("div", { className: 'pic-content' }, data.pics.map((item, index) => {
@@ -12,6 +13,7 @@ const Content = ({ data }) => {
     })));
     const boxGrid_4 = React.createElement("link", { key: "0", rel: "stylesheet", href: require('./../../../resources/css/dynamic/Content.box.grid.4.css') });
     const boxGrid_9 = React.createElement("link", { key: "0", rel: "stylesheet", href: require('./../../../resources/css/dynamic/Content.box.grid.9.css') });
+    /**动态宫格样式 */
     function getBoxGridStyle(pics) {
         if (!Array.isArray(pics) || pics.length === 0) {
             return null;

package/lib/components/dynamic/Footer.js

@@ -3,6 +3,7 @@ import { ConfigController, BOT_NAME } from 'yunzai';
 import Config from '../../utils/config.js';
 import { createRequire } from 'react-puppeteer';
 
+// Footer.tsx
 const botVersion = ConfigController.package?.version;
 const require = createRequire(import.meta.url);
 const bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');

package/lib/components/dynamic/ForwardContent.js

@@ -3,6 +3,8 @@ import Account from './Account.js';
 import Content from './Content.js';
 import { createRequire } from 'react-puppeteer';
 
+// ForwardContent
+// 转发动态内容组件
 const require = createRequire(import.meta.url);
 const ForwardContent = ({ data }) => (React.createElement(React.Fragment, null,
     React.createElement("link", { rel: "stylesheet", href: require("./../../../resources/css/dynamic/ForwardContent.css") }),

package/lib/components/dynamic/LogoText.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import { createRequire } from 'react-puppeteer';
 
+// LogoText
+// Logo 文本组件
 const require = createRequire(import.meta.url);
 const LogoText = ({ data }) => (React.createElement(React.Fragment, null,
     React.createElement("link", { rel: "stylesheet", href: require('./../../../resources/css/dynamic/LogoText.css') }),

package/lib/components/dynamic/MainPage.js

@@ -5,6 +5,7 @@ import ForwardContent from './ForwardContent.js';
 import Footer from './Footer.js';
 import { createRequire } from 'react-puppeteer';
 
+// MainPage.tsx
 const require = createRequire(import.meta.url);
 function App({ data }) {
     return (React.createElement(React.Fragment, null,

package/lib/components/help/Help.js

@@ -3,6 +3,7 @@ import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
 import { createRequire } from 'react-puppeteer';
 
+//help.tsx
 const botVersion = ConfigController.package?.version;
 const require = createRequire(import.meta.url);
 function App({ data }) {

package/lib/components/loginQrcode/Page.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { createRequire } from 'react-puppeteer';
 
+// QrcodeLoginPage.tsx
 const require = createRequire(import.meta.url);
 function App({ data }) {
     return (React.createElement(React.Fragment, null,