yz-yuki-plugin 2.0.7-12 → 2.0.7-14

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # 2.0.7
+* 优化获取B站文章动态内容
+* 优化订阅数据展示
 * 修复同一up订阅多个群聊订阅，推送类型合并的问题
 * 添加白名单关键词过滤功能
 * 新增B站视频解析

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] 

package/lib/apps/bilibili.js

@@ -358,6 +358,17 @@ message.use(async (e) => {
     }
     else {
         let subData = Config.getConfigData('config', 'bilibili', 'push') || { group: {}, private: {} };
+        // 如果聊天ID没有订阅数据，则删除该聊天ID
+        for (let chatType in subData) {
+            if (subData.hasOwnProperty(chatType)) {
+                subData[chatType] = Object.keys(subData[chatType]).reduce((nonEmptyData, chatId) => {
+                    if (subData[chatType][chatId].length > 0) {
+                        nonEmptyData[chatId] = subData[chatType][chatId];
+                    }
+                    return nonEmptyData;
+                }, {});
+            }
+        }
         const messages = [];
         const typeMap = {
             DYNAMIC_TYPE_AV: '视频',
@@ -369,9 +380,9 @@ message.use(async (e) => {
         };
         // 处理群组订阅
         if (subData.group && Object.keys(subData.group).length > 0) {
-            messages.push('------群组B站订阅------\n');
+            messages.push('\n>>>>>>群组B站订阅<<<<<<');
             Object.keys(subData.group).forEach(groupId => {
-                messages.push(`群组ID：${groupId}：`);
+                messages.push(`\n<群组${groupId}>：`);
                 subData.group[groupId].forEach((item) => {
                     const types = new Set();
                     if (item.type && item.type.length) {
@@ -381,15 +392,18 @@ message.use(async (e) => {
                             }
                         });
                     }
-                    messages.push(`${item.name}：${item.uid}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
                 });
             });
         }
+        else {
+            messages.push('\n>>>>>>群组B站订阅<<<<<<\n当前没有任何群组订阅数据~');
+        }
         // 处理私聊订阅
         if (subData.private && Object.keys(subData.private).length > 0) {
-            messages.push('\n------私聊B站订阅------');
+            messages.push('\n>>>>>>私聊B站订阅<<<<<<');
             Object.keys(subData.private).forEach(userId => {
-                messages.push(`用户ID：${userId}：`);
+                messages.push(`\n<用户${userId}>：`);
                 subData.private[userId].forEach((item) => {
                     const types = new Set();
                     if (item.type && item.type.length) {
@@ -399,16 +413,30 @@ message.use(async (e) => {
                             }
                         });
                     }
-                    messages.push(`${item.name}：${item.uid}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
                 });
             });
         }
+        else {
+            messages.push('\n>>>>>>私聊B站订阅<<<<<<\n当前没有任何私聊订阅数据~');
+        }
         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: {} };
+    // 如果聊天ID没有订阅数据，则删除该聊天ID
+    for (let chatType in subData) {
+        if (subData.hasOwnProperty(chatType)) {
+            subData[chatType] = Object.keys(subData[chatType]).reduce((nonEmptyData, chatId) => {
+                if (subData[chatType][chatId].length > 0) {
+                    nonEmptyData[chatId] = subData[chatType][chatId];
+                }
+                return nonEmptyData;
+            }, {});
+        }
+    }
     const messages = [];
     const typeMap = {
         DYNAMIC_TYPE_AV: '视频',
@@ -433,7 +461,7 @@ message.use(async (e) => {
                 }
             });
         }
-        messages.push(`${item.name}：${item.uid}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+        messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
     });
     e.reply(`推送列表如下：\n${messages.join('\n')}`);
 }, [/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(推送|动态|订阅)列表$/]);

package/lib/apps/weibo.js

@@ -86,16 +86,16 @@ message.use(async (e) => {
             return;
         }
         // 获取或初始化微博推送数据
-        let data = weiboPushData || { group: {}, private: {} };
+        let subData = 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] = [];
+        if (!subData[chatType][chatId]) {
+            subData[chatType][chatId] = [];
         }
         // 查找指定UID的订阅数据
-        const upData = data[chatType][chatId].find((item) => item.uid == uid);
+        const upData = subData[chatType][chatId].find((item) => item.uid == uid);
         if (!upData) {
             e.reply(`订阅列表中没有找到该UID~\n${uid}可能是无效的`);
             return;
@@ -105,7 +105,7 @@ message.use(async (e) => {
         let isDel = false;
         if (newType.length) {
             // 更新订阅类型
-            data[chatType][chatId] = data[chatType][chatId].map(item => {
+            subData[chatType][chatId] = subData[chatType][chatId].map(item => {
                 if (item.uid == uid) {
                     item.type = newType;
                 }
@@ -115,11 +115,11 @@ message.use(async (e) => {
         else {
             // 删除订阅
             isDel = true;
-            data[chatType][chatId] = data[chatType][chatId].filter((item) => item.uid !== uid);
+            subData[chatType][chatId] = subData[chatType][chatId].filter((item) => item.uid !== uid);
         }
         // 保存更新后的数据
         //weiboPushData = data;
-        Config.saveConfig('config', 'weibo', 'push', data);
+        Config.saveConfig('config', 'weibo', 'push', subData);
         // 回复用户操作结果
         e.reply(`${isDel ? '删除' : '修改'}微博推送成功~\n${uid}`);
     }
@@ -131,6 +131,17 @@ message.use(async (e) => {
     }
     else {
         let subData = weiboPushData || { group: {}, private: {} };
+        // 如果聊天ID没有订阅数据，则删除该聊天ID
+        for (let chatType in subData) {
+            if (subData.hasOwnProperty(chatType)) {
+                subData[chatType] = Object.keys(subData[chatType]).reduce((nonEmptyData, chatId) => {
+                    if (subData[chatType][chatId].length > 0) {
+                        nonEmptyData[chatId] = subData[chatType][chatId];
+                    }
+                    return nonEmptyData;
+                }, {});
+            }
+        }
         const messages = [];
         const typeMap = {
             DYNAMIC_TYPE_AV: '视频',
@@ -141,9 +152,9 @@ message.use(async (e) => {
         };
         // 处理群组订阅
         if (subData.group && Object.keys(subData.group).length > 0) {
-            messages.push('------群组微博订阅------');
+            messages.push('\n>>>>>>群组微博订阅<<<<<<');
             Object.keys(subData.group).forEach(groupId => {
-                messages.push(`群组ID：${groupId}：`);
+                messages.push(`\n<群组${groupId}>：`);
                 subData.group[groupId].forEach((item) => {
                     const types = new Set();
                     if (item.type && item.type.length) {
@@ -153,15 +164,18 @@ message.use(async (e) => {
                             }
                         });
                     }
-                    messages.push(`${item.name}：${item.uid}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
                 });
             });
         }
+        else {
+            messages.push('\n>>>>>>群组微博订阅<<<<<<\n当前没有任何群组订阅数据~');
+        }
         // 处理私聊订阅
         if (subData.private && Object.keys(subData.private).length > 0) {
-            messages.push('------私聊微博订阅------');
+            messages.push('\n>>>>>>私聊微博订阅<<<<<<');
             Object.keys(subData.private).forEach(userId => {
-                messages.push(`用户ID：${userId}：`);
+                messages.push(`\n<用户${userId}>：`);
                 subData.private[userId].forEach((item) => {
                     const types = new Set();
                     if (item.type && item.type.length) {
@@ -171,16 +185,30 @@ message.use(async (e) => {
                             }
                         });
                     }
-                    messages.push(`${item.name}：${item.uid}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+                    messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
                 });
             });
         }
+        else {
+            messages.push('\n>>>>>>私聊微博订阅<<<<<<\n当前没有任何私聊订阅数据~');
+        }
         e.reply(`推送列表如下：\n${messages.join('\n')}`);
     }
 }, [/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)全部(推送|动态|订阅)列表$/]);
 /** 单独群聊或私聊的订阅的b站推送列表 */
 message.use(async (e) => {
     let subData = weiboPushData || { group: {}, private: {} };
+    // 如果聊天ID没有订阅数据，则删除该聊天ID
+    for (let chatType in subData) {
+        if (subData.hasOwnProperty(chatType)) {
+            subData[chatType] = Object.keys(subData[chatType]).reduce((nonEmptyData, chatId) => {
+                if (subData[chatType][chatId].length > 0) {
+                    nonEmptyData[chatId] = subData[chatType][chatId];
+                }
+                return nonEmptyData;
+            }, {});
+        }
+    }
     const messages = [];
     const typeMap = {
         DYNAMIC_TYPE_AV: '视频',
@@ -204,7 +232,7 @@ message.use(async (e) => {
                 }
             });
         }
-        messages.push(`${item.name}：${item.uid}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
+        messages.push(`${item.uid}：${item.name}  ${types.size ? `[${Array.from(types).join('、')}]` : ' [全部动态]'}`);
     });
     e.reply(`推送列表如下：\n${messages.join('\n')}`);
 }, [/^(#|\/)(yuki|优纪)?(微博|weibo|WEIBO)(推送|动态|订阅)列表$/]);

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 = [];
+                            // 文章类型为 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 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);
-                                    }
-                                }
-                            }
-                            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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.7-12",
+  "version": "2.0.7-14",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",