yz-yuki-plugin 2.0.7-13 → 2.0.7-15

package/CHANGELOG.md

@@ -1,4 +1,7 @@
 # 2.0.7
+* 优化动态检查日志
+* 优化文字动态内容及排版，修复微博视频图片混合的动态显示缺失问题
+* 优化获取B站文章动态内容
 * 优化订阅数据展示
 * 修复同一up订阅多个群聊订阅，推送类型合并的问题
 * 添加白名单关键词过滤功能

package/README.md

@@ -2,7 +2,7 @@
 
 # YUKI-PLUGIN
 
-- 一个适用于 `Yunzai 系列机器人框架` 的B站动态、B站视频链接解析和微博动态订阅推送的插件
+- 一个适用于 `Yunzai 系列机器人框架` 的B站动态、微博动态订阅推送和B站视频链接解析的插件
 
 - 支持 群聊/私聊 订阅B站动态和微博动态，支持定时推送，支持手动触发推送，支持简单查询B站/微博用户信息。
 
@@ -36,7 +36,27 @@ chromium-browser --version
 ## 选择安装方式
 按照网络情况以及使用的bot框架是`Yunzaijs`还是`Yunzai-V3`，选择对应的安装方式。
 
-### ***（一）YunzaiJS***
+### ***（一）Yunzai-V3***
+
+> 仅支持Yunzai-V3（TRSS/Miao）的分支，选择仓库，安装到 `yunzai/plugins`：
+
+gitee仓库：
+```
+git clone --branch main3 https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
+```
+
+github仓库：
+```
+git clone --branch main3 https://github.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
+```
+
+* 安装依赖
+
+```shell
+pnpm install --filter=yuki-plugin
+```
+
+### ***（二）YunzaiJS***
 > 选择其中一种方式安装插件：
 
 1. npm包安装到`yunzaijs/node_modules`的方式，仅YunzaiJS支持：
@@ -86,26 +106,6 @@ git clone --branch main https://github.com/snowtafir/yuki-plugin.git ./plugins/y
 yarn install
 ```
 
-### ***（二）Yunzai-V3***
-
-> 仅支持Yunzai-V3（TRSS/Miao）的分支，选择仓库，安装到 `yunzai/plugins`：
-
-gitee仓库：
-```
-git clone --branch main3 https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
-```
-
-github仓库：
-```
-git clone --branch main3 https://github.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
-```
-
-* 安装依赖
-
-```shell
-pnpm install --filter=yuki-plugin
-```
-
 # 📦二、插件配置
 
 > [!IMPORTANT] 
@@ -255,3 +255,4 @@ yarn install
 |       [TRSS-Yunzai](https://gitee.com/TimeRainStarSky/Yunzai)       | 时雨🌌星空的 TRSS-Yunzai |
 |     [Miao-Yunzai](https://gitee.com/yoimiya-kokomi/Miao-Yunzai)     | 喵喵的 Miao-Yunzai      |
 |         [Yunzai-Bot](https://gitee.com/Le-niao/Yunzai-Bot)          | 乐神的 Yunzai-Bot       |
+|[jsxp](https://github.com/lemonade-lab/lvyjs/tree/main/packages/jsxp) | 一个可以在 tsx 环境中,使用 puppeteer 对 tsx 组件进行截图的库 |

package/lib/apps/bilibili.js

@@ -383,17 +383,19 @@ message.use(async (e) => {
             messages.push('\n>>>>>>群组B站订阅<<<<<<');
             Object.keys(subData.group).forEach(groupId => {
                 messages.push(`\n<群组${groupId}>：`);
-                subData.group[groupId].forEach((item) => {
-                    const types = new Set();
-                    if (item.type && item.type.length) {
-                        item.type.forEach((typeItem) => {
-                            if (typeMap[typeItem]) {
-                                types.add(typeMap[typeItem]);
-                            }
-                        });
-                    }
-                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
-                });
+                if (subData.group) {
+                    subData.group[groupId].forEach((item) => {
+                        const types = new Set();
+                        if (item.type && item.type.length) {
+                            item.type.forEach((typeItem) => {
+                                if (typeMap[typeItem]) {
+                                    types.add(typeMap[typeItem]);
+                                }
+                            });
+                        }
+                        messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    });
+                }
             });
         }
         else {
@@ -404,17 +406,19 @@ message.use(async (e) => {
             messages.push('\n>>>>>>私聊B站订阅<<<<<<');
             Object.keys(subData.private).forEach(userId => {
                 messages.push(`\n<用户${userId}>：`);
-                subData.private[userId].forEach((item) => {
-                    const types = new Set();
-                    if (item.type && item.type.length) {
-                        item.type.forEach((typeItem) => {
-                            if (typeMap[typeItem]) {
-                                types.add(typeMap[typeItem]);
-                            }
-                        });
-                    }
-                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
-                });
+                if (subData.private) {
+                    subData.private[userId].forEach((item) => {
+                        const types = new Set();
+                        if (item.type && item.type.length) {
+                            item.type.forEach((typeItem) => {
+                                if (typeMap[typeItem]) {
+                                    types.add(typeMap[typeItem]);
+                                }
+                            });
+                        }
+                        messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    });
+                }
             });
         }
         else {
@@ -486,9 +490,9 @@ message.use(async (e) => {
         e.reply('用户不存在，输入的uid无效。');
         return;
     }
-    const message = [`昵称：${data?.name}`, `\n性别：${data?.sex}`, `\n等级：${data?.level}`];
+    const message = [`--------------------`, `\n昵称：${data?.name}`, `\n性别：${data?.sex}`, `\n等级：${data?.level}`, `\n--------------------`];
     if (data.live_room) {
-        message.push(`\n***********\n---直播信息---`, `\n直播标题：${data?.live_room?.title}`, `\n直播房间：${data?.live_room?.roomid}`, `\n直播状态：${data?.live_room?.liveStatus ? '直播中' : '未开播'}`, `\n观看人数：${data?.live_room?.watched_show?.num}人`);
+        message.push(`\n>>>>>直播间信息<<<<<`, `\n标题：${data?.live_room?.title}`, `\n房间：${data?.live_room?.roomid}`, `\n状态：${data?.live_room?.liveStatus ? '直播中' : '未开播'}`, `\n观看人数：${data?.live_room?.watched_show?.num}`);
         e.reply(`直播链接：${data?.live_room?.url}`);
     }
     e.reply(message);

package/lib/components/dynamic/Content.js

@@ -83,9 +83,9 @@ const Content = ({ data }) => {
                 contentCss,
                 boxGrid,
                 React.createElement("div", { className: "content" },
-                    picItems,
                     React.createElement("div", { className: "content-text-title", style: { marginBottom: '10px' } }, data.title && React.createElement("h1", null, data.title)),
-                    React.createElement("div", { className: "content-text", dangerouslySetInnerHTML: { __html: data.content || '' } }))));
+                    React.createElement("div", { className: "content-text", dangerouslySetInnerHTML: { __html: data.content || '' } }),
+                    picItems)));
         case 'DYNAMIC_TYPE_WORD':
             return (React.createElement(React.Fragment, null,
                 contentCss,

package/lib/components/dynamic/Footer.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzaijs';
+import { ConfigController, BOT_NAME } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
-import { createRequire, _paths } from '../../utils/paths.js';
+import { _paths, createRequire } from '../../utils/paths.js';
 
 // Footer.tsx
 const require = createRequire(import.meta.url);

package/lib/components/help/Help.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzaijs';
+import { ConfigController, BOT_NAME } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
-import { createRequire, _paths } from '../../utils/paths.js';
+import { _paths, createRequire } from '../../utils/paths.js';
 
 //help.tsx
 const require = createRequire(import.meta.url);

package/lib/components/version/Version.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzaijs';
+import { ConfigController, BOT_NAME } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
-import { createRequire, _paths } from '../../utils/paths.js';
+import { _paths, createRequire } from '../../utils/paths.js';
 
 const require = createRequire(import.meta.url);
 const botVersion = ConfigController.package?.version;

package/lib/models/bilibili/bilibili.main.query.js

@@ -102,42 +102,28 @@ class BiliQuery {
                     formatData.data.title = desc?.title;
                     additional = data?.modules?.module_dynamic?.additional;
                     // 文章内容过长，则尝试获取全文
+                    let content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text, additional) || '';
                     if (String(desc?.summary?.text).length >= 480) {
                         const fullArticleContent = await this.getFullArticleContent(this.formatUrl(desc?.jump_url));
                         if (fullArticleContent) {
                             const { readInfo, articleType } = fullArticleContent;
-                            // 文章链接类型为 cv（旧类型） 或者 opus（新类型）
-                            if (articleType === 'cv') {
-                                formatData.data.content = this.praseFullOldTypeArticleContent(readInfo?.content);
-                                if (String(formatData.data.content).length < 100) {
-                                    formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text, additional) || '';
-                                    formatData.data.pics = pics;
-                                }
-                                else {
-                                    formatData.data.pics = [];
-                                }
-                            }
-                            else if (articleType === 'opus') {
-                                const FullNewTypeArticleContent = this.praseFullNewTypeArticleContent(readInfo?.paragraphs);
-                                if (FullNewTypeArticleContent) {
-                                    const { content, img } = FullNewTypeArticleContent;
-                                    formatData.data.content = content;
-                                    formatData.data.pics = img && img.length > 0 ? img : pics;
-                                    if (content && content.length < 100) {
-                                        formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text, additional);
-                                    }
+                            // 文章类型为 cv（旧类型） 或者 opus（新类型）
+                            if (articleType === 'opus') {
+                                const newTypeContent = this.praseFullNewTypeArticleContent(readInfo?.paragraphs);
+                                if (newTypeContent) {
+                                    content = newTypeContent.content || content;
+                                    pics = newTypeContent.img && newTypeContent.img.length > 0 ? newTypeContent.img : pics;
                                 }
                             }
-                            else {
-                                formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text, additional) || '';
-                                formatData.data.pics = pics;
+                            else if (articleType === 'cv') {
+                                const oldTypeContent = this.praseFullOldTypeArticleContent(readInfo?.content);
+                                content = oldTypeContent || content;
                             }
+                            content = String(content).length < 100 ? this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text, additional) : content;
                         }
                     }
-                    else {
-                        formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text, additional) || '';
-                        formatData.data.pics = pics;
-                    }
+                    formatData.data.content = content;
+                    formatData.data.pics = pics;
                 }
                 else if (majorType === 'MAJOR_TYPE_ARTICLE') {
                     desc = data?.modules?.module_dynamic?.major?.article || {};
@@ -251,7 +237,7 @@ class BiliQuery {
     };
     /**获取完整B站文章内容
      * @param postUrl - 文章链接: https://www.bilibili.com/read/cvxxxx 或者 https://www.bilibili.com/opus/xxxx
-     * @returns {JSON} 完整的B站文章内容json数据
+     * @returns  完整的B站文章内容json数据
      */
     static async getFullArticleContent(postUrl) {
         let { cookie } = await readSyncCookie();
@@ -262,24 +248,22 @@ class BiliQuery {
                 responseType: 'text'
             });
             const text = response.data;
-            let match, readInfo, articleType;
-            if (/^https:\/\/www.bilibili.com\/read\/cv/.test(postUrl)) {
-                match = String(text).match(/"readInfo":([\s\S]+?),"readViewInfo":/);
-                if (match) {
-                    const full_json_text = match[1];
-                    readInfo = JSON.parse(full_json_text);
-                    articleType = 'cv';
-                    return { readInfo, articleType };
-                }
+            let matchCV, matchOPUS, readInfo, articleType;
+            matchCV = String(text).match(/"readInfo":([\s\S]+?),"readViewInfo":/);
+            matchOPUS = String(text).match(/"module_content"\s*:\s*([\s\S]+?)\s*,\s*"module_type"\s*:\s*"MODULE_TYPE_CONTENT"/);
+            if (matchOPUS) {
+                logger.info(`文章内容新`);
+                const full_json_text = matchOPUS[1];
+                readInfo = JSON.parse(full_json_text);
+                articleType = 'opus';
+                return { readInfo, articleType };
             }
-            else if (/^https:\/\/www.bilibili.com\/opus\//.test(postUrl)) {
-                match = String(text).match(/"module_content":([\s\S]+?),\s*"module_type":"MODULE_TYPE_CONTENT"/);
-                if (match) {
-                    const full_json_text = match[1];
-                    readInfo = JSON.parse(full_json_text);
-                    articleType = 'opus';
-                    return { readInfo, articleType };
-                }
+            else if (matchCV) {
+                logger.info(`文章内容旧`);
+                const full_json_text = matchCV[1];
+                readInfo = JSON.parse(full_json_text);
+                articleType = 'cv';
+                return { readInfo, articleType };
             }
         }
         catch (err) {
@@ -399,9 +383,15 @@ class BiliQuery {
      */
     static async formatTextDynamicData(upName, data, isForward, setData) {
         const BiliDrawDynamicLinkUrl = 'https://m.bilibili.com/dynamic/';
-        let desc, msg = [], pics = [], author, majorType, content, dynamicTitle;
-        let title = `B站【${upName}】动态推送：\n`;
+        let desc, msg = [], pics = [], author, majorType, content, dynamicTitle, module_stat;
+        let msg_meta = `B站【${upName}】动态推送：\n`;
         let dynamicType = data.type;
+        function formatNumber(num) {
+            if (num >= 10000) {
+                return `${(num / 10000).toFixed(1)}万`;
+            }
+            return num.toString();
+        }
         switch (dynamicType) {
             case 'DYNAMIC_TYPE_AV':
                 // 处理视频动态
@@ -409,14 +399,22 @@ class BiliQuery {
                 author = data?.modules?.module_author;
                 if (!desc && !author)
                     return;
-                title = `B站【${upName}】视频动态推送：\n`;
+                module_stat = data?.modules?.module_stat;
+                msg_meta = `B站【${upName}】视频动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `标题：${desc.title}\n`,
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n${desc.title}`, // 标题
+                    `\n--------------------`,
+                    `\n视频简介：`,
                     `${desc.desc}\n`,
-                    `链接：${this.formatUrl(desc.jump_url)}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    `\n--------------------`,
+                    `投稿：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${desc?.stat?.danmaku}弹幕 • ${desc?.stat?.play}播放`,
+                    `\n${formatNumber(module_stat?.like?.count)}点赞 • ${formatNumber(module_stat?.comment?.count)}评论 • ${formatNumber(module_stat?.forward?.count)}转发`,
+                    `\n--------------------`,
+                    `\n链接：${this.formatUrl(desc.jump_url)}`
                 ];
                 pics = [Segment.image(desc?.cover)];
                 return { msg, pics, dynamicType };
@@ -441,13 +439,19 @@ class BiliQuery {
                 }
                 if (!desc && !author)
                     return;
-                title = `B站【${upName}】动态推送：\n`;
+                module_stat = data?.modules?.module_stat;
+                msg_meta = `B站【${upName}】图文动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `内容：${this.dynamicContentLimit(content, setData)}\n`,
-                    `链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(content, setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(module_stat?.like?.count)}点赞 • ${formatNumber(module_stat?.comment?.count)}评论 • ${formatNumber(module_stat?.forward?.count)}转发`,
+                    `\n--------------------`,
+                    `\n链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`
                 ];
                 return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_DRAW':
@@ -480,6 +484,7 @@ class BiliQuery {
                 }
                 if (!desc && !pics && !author)
                     return;
+                module_stat = data?.modules?.module_stat;
                 const dynamicPicCountLimit = setData.pushPicCountLimit || 3;
                 if (pics.length > dynamicPicCountLimit) {
                     pics.length = dynamicPicCountLimit;
@@ -487,13 +492,18 @@ class BiliQuery {
                 pics = pics.map((item) => {
                     return Segment.image(item);
                 });
-                title = `B站【${upName}】图文动态推送：\n`;
+                msg_meta = `B站【${upName}】图文动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `${this.dynamicContentLimit(content, setData)}\n`,
-                    `链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(content, setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(module_stat?.like?.count)}点赞 • ${formatNumber(module_stat?.comment?.count)}评论 • ${formatNumber(module_stat?.forward?.count)}转发`,
+                    `\n--------------------`,
+                    `\n链接：${BiliDrawDynamicLinkUrl}${data.id_str}`
                 ];
                 return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_ARTICLE':
@@ -527,16 +537,24 @@ class BiliQuery {
                 }
                 if (!desc && !author)
                     return;
+                module_stat = data?.modules?.module_stat;
                 pics = pics.map((item) => {
                     return Segment.image(item);
                 });
-                title = `B站【${upName}】文章动态推送：\n`;
+                msg_meta = `B站【${upName}】文章动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `标题：${dynamicTitle}\n`,
-                    `链接：${this.formatUrl(desc.jump_url)}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n${dynamicTitle}`,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(content, setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(module_stat?.like?.count)}点赞 • ${formatNumber(module_stat?.comment?.count)}评论 • ${formatNumber(module_stat?.forward?.count)}转发`,
+                    `\n--------------------`,
+                    `\n链接：${this.formatUrl(desc.jump_url)}`
                 ];
                 return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_FORWARD':
@@ -548,6 +566,7 @@ class BiliQuery {
                     return;
                 if (!data.orig)
                     return;
+                module_stat = data?.modules?.module_stat;
                 isForward = true;
                 let orig = await this.formatTextDynamicData(upName, data.orig, isForward, setData);
                 let origContent = [];
@@ -558,14 +577,19 @@ class BiliQuery {
                 else {
                     return 'continue';
                 }
-                title = `B站【${upName}】转发动态推送：\n`;
+                msg_meta = `B站【${upName}】转发动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `${this.dynamicContentLimit(content, setData)}\n`,
-                    `链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
-                    `时间：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}\n`,
-                    '\n---以下为转发内容---\n',
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(content, setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${author ? moment(author.pub_ts * 1000).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(module_stat?.like?.count)}点赞 • ${formatNumber(module_stat?.comment?.count)}评论 • ${formatNumber(module_stat?.forward?.count)}转发`,
+                    `\n--------------------`,
+                    `\n链接：${BiliDrawDynamicLinkUrl}${data.id_str}\n`,
+                    '\n>>>>以下为转发内容<<<<\n',
                     ...origContent
                 ];
                 return { msg, pics, dynamicType };
@@ -578,8 +602,18 @@ class BiliQuery {
                 desc = desc?.live_play_info;
                 if (!desc)
                     return;
-                title = `B站【${upName}】直播动态推送：\n`;
-                msg = [title, `-----------------------------\n`, `标题：${desc.title}\n`, `链接：https:${desc.link}`];
+                msg_meta = `B站【${upName}】直播动态推送：\n`;
+                msg = [
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n${desc.title}`,
+                    `\n--------------------`,
+                    `\n分区：${desc?.parent_area_name} (${desc?.area_name})`,
+                    `\n开播：${moment(desc.live_start_time * 1000).format('YYYY年MM月DD日 HH:mm:ss')}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(desc?.watched_show?.num)}人看过`,
+                    `\n链接：https:${desc.link}`
+                ];
                 pics = [Segment.image(desc.cover)];
                 return { msg, pics, dynamicType };
             default:

package/lib/models/bilibili/bilibili.main.task.js

@@ -60,6 +60,7 @@ class BiliTask {
     async processBiliData(biliPushData, biliConfigData, uidMap, dynamicList) {
         let getDataRandomDelay = biliConfigData?.getDataRandomDelay || 8000; // 获取相邻up动态数据的随机延时间隔
         const requestedDataOfUids = new Map(); // 存放已请求的 uid 映射
+        const printedList = new Set(); // 已打印的动态列表
         for (let chatType in biliPushData) {
             // 遍历 group 和 private
             if (!uidMap.has(chatType)) {
@@ -75,6 +76,10 @@ class BiliTask {
                     let resp;
                     // 检查是否已经请求过该 uid
                     if (!requestedDataOfUids.has(uid)) {
+                        if (!printedList.has(uid)) {
+                            logger.info(`正在检测B站动态 [ ${name} : ${uid} ]`);
+                            printedList.add(uid);
+                        }
                         resp = await this.hendleEventDynamicData(uid);
                         if (resp) {
                             if (resp.code === 0) {
@@ -110,6 +115,7 @@ class BiliTask {
             }
         }
         requestedDataOfUids.clear(); // 清空已请求的 uid 映射
+        printedList.clear(); // 清空已打印的动态列表
     }
     /**
      * 构建uid对应动态数据映射
@@ -120,17 +126,12 @@ class BiliTask {
      * @param biliConfigData Bilibili配置数据
      */
     async makeUidDynamicDataMap(uidMap, dynamicList, now, dynamicTimeRange, biliConfigData, messageMap) {
-        const printedList = new Set(); // 已打印的动态列表
         for (let [chatType, chatTypeMap] of uidMap) {
             for (let [upUid, bot_idMap] of chatTypeMap) {
                 const tempDynamicList = dynamicList[upUid] || [];
                 const willPushDynamicList = [];
                 for (let dynamicItem of tempDynamicList) {
                     let author = dynamicItem?.modules?.module_author || {};
-                    if (!printedList.has(author?.mid)) {
-                        logger.info(`正在检测B站动态 [ ${author?.name} : ${author?.mid} ]`);
-                        printedList.add(author?.mid);
-                    }
                     if (!author?.pub_ts)
                         continue; // 如果动态没有发布时间，跳过当前循环
                     if (Number(now - author.pub_ts) > dynamicTimeRange) {
@@ -157,7 +158,6 @@ class BiliTask {
                 }
             }
         }
-        printedList.clear(); // 清空已打印的动态列表
     }
     /**
      * 渲染构建待发送的动态消息数据的映射数组

package/lib/models/weibo/weibo.main.query.js

@@ -72,7 +72,7 @@ class WeiboQuery {
         /**动态详情链接 */
         let detail_url = `https://weibo.com/${info?.user?.id}/${info?.bid}`;
         /* 构造动态渲染数据 *************************** */
-        let pics = [];
+        let pics = [], video_pics_list;
         let formatData = { data: {} };
         /**头像 */
         formatData.data.face = face_url;
@@ -85,12 +85,17 @@ class WeiboQuery {
         formatData.data.type = type;
         switch (type) {
             case 'DYNAMIC_TYPE_AV':
+                video_pics_list = info?.pics ? info?.pics : info?.page_info?.page_pic?.url ? [{ large: { url: info.page_info.page_pic.url } }] : [];
+                pics =
+                    video_pics_list.map((img) => {
+                        return { url: img?.large?.url, width: Number(img?.large?.geo?.width), height: Number(img?.large?.geo?.height) };
+                    }) || [];
                 formatData.data.title = info?.page_info?.title || '';
                 formatData.data.content = this.parseRichTextNodes(info?.text);
                 formatData.data.url = detail_url;
                 formatData.data.pubTs = moment(created_time).format('YYYY年MM月DD日 HH:mm:ss');
                 formatData.data.category = '视频动态';
-                formatData.data.pics = info?.page_info?.page_pic?.url ? [{ url: info.page_info.page_pic.url }] : [];
+                formatData.data.pics = pics;
                 break;
             case 'DYNAMIC_TYPE_DRAW':
                 let raw_pics_list = retweeted ? info?.retweeted_status?.pics || [] : info?.pics || [];
@@ -182,7 +187,7 @@ class WeiboQuery {
         /**图片高清资源链接*/
         pic_urls = [], 
         /**图片*/
-        pics = [];
+        pics = [], video_pics_list;
         let info = raw_post?.mblog || raw_post;
         let retweeted = info && info.retweeted_status ? true : false; //是否为转发动态
         let pic_num = retweeted ? info?.retweeted_status?.pic_num : info?.pic_num;
@@ -205,24 +210,39 @@ class WeiboQuery {
         /**动态发布时间 */
         let created_time = this.getDynamicCreatetDate(raw_post);
         let detail_url = `https://weibo.com/${info?.user?.id}/${info?.bid}`;
-        let title = `微博【${upName}】动态推送：\n`;
+        let msg_meta = `微博【${upName}】动态推送：\n`;
         const dynamicPicCountLimit = setData.pushPicCountLimit || 3;
+        function formatNumber(num) {
+            if (num >= 10000) {
+                return `${(num / 10000).toFixed(1)}万`;
+            }
+            return num.toString();
+        }
         switch (dynamicType) {
             case 'DYNAMIC_TYPE_AV':
                 if (!info)
                     return;
-                let cover_img_url = info?.page_info?.page_pic?.url;
-                let cover_img = Segment.image(cover_img_url, false, 15000, { referer: 'https://weibo.com' });
-                title = `微博【${upName}】视频动态推送：\n`;
+                video_pics_list = info?.pics ? info?.pics : info?.page_info?.page_pic?.url ? [{ large: { url: info.page_info.page_pic.url } }] : [];
+                pic_urls = video_pics_list.map(img => img?.large?.url);
+                for (const pic_url of pic_urls) {
+                    const temp = Segment.image(pic_url, false, 15000, { referer: 'https://weibo.com' });
+                    pics.push(temp);
+                }
+                msg_meta = `微博【${upName}】视频动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `标题：${info?.page_info?.title || ''}\n`,
-                    `${this.filterText(info?.text)}\n`,
-                    `链接：${detail_url}\n`,
-                    `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n${info?.page_info?.title || ''}`, //标题
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.filterText(info?.text)}`,
+                    `\n--------------------`,
+                    `\n投稿：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(info?.attitudes_count)}点赞 • ${formatNumber(info?.comments_count)}评论 • ${formatNumber(info?.reposts_count)}转发 `,
+                    `\n--------------------`,
+                    `\n链接：${detail_url}`
                 ];
-                pics = [cover_img];
                 return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_DRAW':
                 raw_pics_list = retweeted ? info?.retweeted_status?.pics || [] : info?.pics || [];
@@ -235,13 +255,18 @@ class WeiboQuery {
                     const temp = Segment.image(pic_url, false, 15000, { referer: 'https://weibo.com' });
                     pics.push(temp);
                 }
-                title = `微博【${upName}】图文动态推送：\n`;
+                msg_meta = `微博【${upName}】图文动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `${this.dynamicContentLimit(this.filterText(info?.text), setData)}\n`,
-                    `链接：${detail_url}\n`,
-                    `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(this.filterText(info?.text), setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(info?.attitudes_count)}点赞 • ${formatNumber(info?.comments_count)}评论 • ${formatNumber(info?.reposts_count)}转发 `,
+                    `\n--------------------`,
+                    `\n链接：${detail_url}`
                 ];
                 return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_ARTICLE':
@@ -255,13 +280,18 @@ class WeiboQuery {
                     const temp = Segment.image(pic_url, false, 15000, { referer: 'https://weibo.com' });
                     pics.push(temp);
                 }
-                title = `微博【${upName}】文章动态推送：\n`;
+                msg_meta = `微博【${upName}】文章动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `正文：${this.dynamicContentLimit(this.filterText(info?.text), setData)}\n`,
-                    `链接：${detail_url}\n`,
-                    `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(this.filterText(info?.text), setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(info?.attitudes_count)}点赞 • ${formatNumber(info?.comments_count)}评论 • ${formatNumber(info?.reposts_count)}转发 `,
+                    `\n--------------------`,
+                    `\n链接：${detail_url}`
                 ];
                 return { msg, pics, dynamicType };
             case 'DYNAMIC_TYPE_FORWARD':
@@ -280,14 +310,19 @@ class WeiboQuery {
                 else {
                     return 'continue';
                 }
-                title = `微博【${upName}】转发动态推送：\n`;
+                msg_meta = `微博【${upName}】转发动态推送：\n`;
                 msg = [
-                    title,
-                    `-----------------------------\n`,
-                    `${this.dynamicContentLimit(this.filterText(info?.text), setData)}\n`,
-                    `链接：${detail_url}\n`,
-                    `时间：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}\n`,
-                    '\n---以下为转发内容---\n',
+                    msg_meta,
+                    `\n--------------------`,
+                    `\n正文：`,
+                    `\n${this.dynamicContentLimit(this.filterText(info?.text), setData)}`,
+                    `\n--------------------`,
+                    `\n投稿：${created_time ? moment(created_time).format('YYYY年MM月DD日 HH:mm:ss') : ''}`,
+                    `\n--------------------`,
+                    `\n${formatNumber(info?.attitudes_count)}点赞 • ${formatNumber(info?.comments_count)}评论 • ${formatNumber(info?.reposts_count)}转发 `,
+                    `\n--------------------`,
+                    `\n链接：${detail_url}\n`,
+                    '\n>>>>以下为转发内容<<<<\n',
                     ...origContent
                 ];
                 return { msg, pics, dynamicType };

package/lib/models/weibo/weibo.main.task.js

@@ -40,6 +40,7 @@ class WeiboTask {
      */
     async processWeiboData(weiboPushData, uidMap, dynamicList) {
         const requestedDataOfUids = new Map(); // 存放已请求的 uid 映射
+        const printedList = new Set(); // 已打印的动态列表
         for (let chatType in weiboPushData) {
             // 遍历 group 和 private
             if (!uidMap.has(chatType)) {
@@ -55,11 +56,15 @@ class WeiboTask {
                     let resp;
                     // 检查是否已经请求过该 uid
                     if (!requestedDataOfUids.has(uid)) {
+                        if (!printedList.has(uid)) {
+                            logger.info(`正在检测微博动态 [ ${name} : ${uid} ]`);
+                            printedList.add(uid);
+                        }
                         resp = await new WeiboWebDataFetcher().getBloggerDynamicList(uid); // 获取指定 uid 的动态列表
                         if (resp) {
                             requestedDataOfUids.set(uid, resp); // 将响应数据存储到映射中
                             const dynamicData = resp || [];
-                            dynamicList[subInfoOfup.uid] = dynamicData;
+                            dynamicList[uid] = dynamicData;
                         }
                     }
                     if (!chatTypeMap.has(uid)) {
@@ -76,6 +81,7 @@ class WeiboTask {
             }
         }
         requestedDataOfUids.clear(); // 清空已请求的映射
+        printedList.clear(); // 清空已打印的动态列表
     }
     /**
      * 构建uid对应动态数据映射
@@ -86,7 +92,6 @@ class WeiboTask {
      * @param weiboConfigData 微博配置数据
      */
     async makeUidDynamicDataMap(uidMap, dynamicList, now, dynamicTimeRange, weiboConfigData, messageMap) {
-        const printedList = new Set(); // 已打印的动态列表
         for (let [chatType, chatTypeMap] of uidMap) {
             for (let [upUid, bot_idMap] of chatTypeMap) {
                 const tempDynamicList = dynamicList[upUid] || [];
@@ -94,10 +99,6 @@ class WeiboTask {
                 for (let dynamicItem of tempDynamicList) {
                     let raw_post = dynamicItem || {};
                     let user = raw_post?.mblog?.user || {};
-                    if (!printedList.has(user?.id)) {
-                        logger.info(`正在检测微博动态 [ ${user?.screen_name} : ${user?.id} ]`);
-                        printedList.add(user?.id);
-                    }
                     if (!raw_post?.mblog?.created_at)
                         continue;
                     if (Number(now - WeiboQuery.getDynamicCreatetDate(raw_post) / 1000) > dynamicTimeRange) {
@@ -124,7 +125,6 @@ class WeiboTask {
                 }
             }
         }
-        printedList.clear(); // 清空已打印的动态列表
     }
     /**
      * 渲染构建待发送的动态消息数据的映射数组

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.7-13",
+  "version": "2.0.7-15",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -31,12 +31,12 @@
     "debug": "^4.3.6",
     "jsdom": "^25.0.1",
     "json5": "^2.2.3",
-    "jsxp": "^1.1.2",
+    "jsxp": "^1.2.1",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
-    "puppeteer": "^24.4.0",
+    "puppeteer": "^24.8.2",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -63,14 +63,14 @@
     "icqq": "^0.6.10",
     "jsdom": "^24.1.1",
     "json5": "^2.2.3",
-    "jsxp": "^1.1.2",
+    "jsxp": "^1.2.1",
     "lodash": "^4.17.21",
-    "lvyjs": "^0.2.14",
+    "lvyjs": "^0.2.19",
     "md5": "^2.3.0",
     "node-fetch": "^3.3.2",
     "postcss": "^8.4.47",
     "prettier": "^3.4.2",
-    "puppeteer": "^24.4.0",
+    "puppeteer": "^24.8.2",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",