koishi-plugin-bilibili-notify 3.2.0-alpha.4 → 3.2.0-alpha.5

package/lib/comRegister.js

@@ -273,9 +273,32 @@ class ComRegister {
             // 获取动态内容
             const item = content.data.items[i];
             // 生成图片
-            const buffer = await this.ctx.gi.generateDynamicImg(item);
+            const buffer = await (0, utils_1.withRetry)(async () => {
+                // 渲染图片
+                return await this.ctx.gi.generateDynamicImg(item);
+            }, 1).catch(async (e) => {
+                // 直播开播动态，不做处理
+                if (e.message === "直播开播动态，不做处理") {
+                    await session.send("直播开播动态，不做处理");
+                    return;
+                }
+                if (e.message === "出现关键词，屏蔽该动态") {
+                    await session.send("已屏蔽该动态");
+                    return;
+                }
+                if (e.message === "已屏蔽转发动态") {
+                    await session.send("已屏蔽转发动态");
+                    return;
+                }
+                if (e.message === "已屏蔽专栏动态") {
+                    await session.send("已屏蔽专栏动态");
+                    return;
+                }
+                // 未知错误
+                this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
+            });
             // 发送图片
-            await session.send(koishi_1.h.image(buffer, "image/jpeg"));
+            buffer && (await session.send(koishi_1.h.image(buffer, "image/jpeg")));
         });
     }
     async init(config) {
@@ -1264,7 +1287,7 @@ class ComRegister {
                     ? this.config.customLive
                         .replace("-name", liveStatus.masterInfo.username)
                         .replace("-time", await this.ctx.gi.getTimeDifference(liveStatus.liveStartTime))
-                        .replace("-watched", "")
+                        .replace("-watched", "API模式无法获取")
                         .replace("\\n", "\n")
                         .replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`)
                     : null;
@@ -1412,7 +1435,7 @@ class ComRegister {
                                 ? this.config.customLive
                                     .replace("-name", liveStatus.masterInfo.username)
                                     .replace("-time", await this.ctx.gi.getTimeDifference(liveStatus.liveStartTime))
-                                    .replace("-watched", "")
+                                    .replace("-watched", "API模式无法获取")
                                     .replace("\\n", "\n")
                                     .replace("-link", `https://live.bilibili.com/${liveStatus.liveRoomInfo.short_id === 0 ? liveStatus.liveRoomInfo.room_id : liveStatus.liveRoomInfo.short_id}`)
                                 : null;

package/lib/generateImg.d.ts

@@ -1,5 +1,5 @@
 import { type Context, Schema, Service } from "koishi";
-import type { Dynamic } from "./type";
+import type { Dynamic, RichTextNode } from "./type";
 declare module "koishi" {
     interface Context {
         gi: GenerateImg;
@@ -16,6 +16,7 @@ declare class GenerateImg extends Service {
         cardBasePlateColor?: string;
         cardBasePlateBorder?: string;
     }): Promise<Buffer<ArrayBufferLike>>;
+    richTextParser(rt: RichTextNode, title?: string): string;
     generateDynamicImg(data: Dynamic, { cardColorStart, cardColorEnd, cardBasePlateColor, cardBasePlateBorder, }?: {
         cardColorStart?: string;
         cardColorEnd?: string;

package/lib/generateImg.js

@@ -194,7 +194,7 @@ class GenerateImg extends koishi_1.Service {
                                         ${liveStatus === 1
                 ? `当前粉丝数：${followerDisplay}`
                 : liveStatus === 2
-                    ? `${followerDisplay !== "API" ? `粉丝数变化：${followerDisplay}` : ""}`
+                    ? `${followerDisplay !== "API" ? `累计观看人数：${followerDisplay}` : ""}`
                     : liveStatus === 3
                         ? `粉丝数变化：${followerDisplay}`
                         : ""}
@@ -214,6 +214,37 @@ class GenerateImg extends koishi_1.Service {
             throw new Error(`生成图片失败！错误: ${e.toString()}`);
         });
     }
+    richTextParser(rt, title) {
+        const richText = rt.reduce((accumulator, currentValue) => {
+            if (currentValue.emoji) {
+                return /* html */ `${accumulator}<img style="width:28px; height:28px;" src="${currentValue.emoji.icon_url}"/>`;
+            }
+            return accumulator + currentValue.text;
+        }, "");
+        // 关键字和正则屏蔽
+        if (this.giConfig.filter.enable) {
+            // 开启动态屏蔽功能
+            if (this.giConfig.filter.regex) {
+                // 正则屏蔽
+                const reg = new RegExp(this.giConfig.filter.regex);
+                if (reg.test(richText))
+                    throw new Error("出现关键词，屏蔽该动态");
+            }
+            if (this.giConfig.filter.keywords.length !== 0 &&
+                this.giConfig.filter.keywords.some((keyword) => richText.includes(keyword))) {
+                throw new Error("出现关键词，屏蔽该动态");
+            }
+        }
+        // 查找\n
+        const text = richText.replace(/\n/g, "<br>");
+        // 拼接字符串
+        return /* html */ `
+            <div class="card-details">
+                ${title ? `<h1 class="dyn-title">${title}</h1>` : ""}
+                ${text}
+            </div>
+        `;
+    }
     async generateDynamicImg(data, { cardColorStart = this.giConfig.cardColorStart, cardColorEnd = this.giConfig.cardColorEnd, cardBasePlateColor = this.giConfig.cardBasePlateColor, cardBasePlateBorder = this.giConfig.cardBasePlateBorder, } = {}) {
         // module_author
         const module_author = data.modules.module_author;
@@ -241,44 +272,21 @@ class GenerateImg extends koishi_1.Service {
         const getDynamicMajor = async (dynamic, forward) => {
             // 定义返回值
             let main = "";
-            let link = "";
             // 定义forward类型返回值
             let forwardInfo;
             // 最基本的图文处理
             const basicDynamic = () => {
+                // 获取动态内容
                 const module_dynamic = dynamic.modules.module_dynamic;
-                if (module_dynamic?.major?.opus?.summary) {
-                    const richText = module_dynamic.major.opus.summary.rich_text_nodes.reduce((accumulator, currentValue) => {
-                        if (currentValue.emoji) {
-                            return /* html */ `${accumulator}<img style="width:28px; height:28px;" src="${currentValue.emoji.icon_url}"/>`;
-                        }
-                        return accumulator + currentValue.text;
-                    }, "");
-                    // 关键字和正则屏蔽
-                    if (this.giConfig.filter.enable) {
-                        // 开启动态屏蔽功能
-                        if (this.giConfig.filter.regex) {
-                            // 正则屏蔽
-                            const reg = new RegExp(this.giConfig.filter.regex);
-                            if (reg.test(richText))
-                                throw new Error("出现关键词，屏蔽该动态");
-                        }
-                        if (this.giConfig.filter.keywords.length !== 0 &&
-                            this.giConfig.filter.keywords.some((keyword) => richText.includes(keyword))) {
-                            throw new Error("出现关键词，屏蔽该动态");
-                        }
-                    }
-                    // 查找\n
-                    const text = richText.replace(/\n/g, "<br>");
-                    // 拼接字符串
-                    if (text) {
-                        main += /* html */ `
-                            <div class="card-details">
-                                ${module_dynamic.major.opus.title ? `<h1 class="dyn-title">${module_dynamic.major.opus.title}</h1>` : ""}
-                                ${text}
-                            </div>
-                        `;
-                    }
+                // 判断是否有desc
+                if (module_dynamic?.desc?.rich_text_nodes) {
+                    const content = this.richTextParser(module_dynamic.desc.rich_text_nodes);
+                    main += content;
+                }
+                // 判断是否有summary
+                if (module_dynamic?.major?.opus?.summary?.rich_text_nodes) {
+                    const content = this.richTextParser(module_dynamic.major.opus.summary.rich_text_nodes, module_dynamic.major.opus.title);
+                    main += content;
                 }
                 // 图片
                 let major = "";
@@ -341,7 +349,7 @@ class GenerateImg extends koishi_1.Service {
                         const forwardUserName = forward_module_author.name;
                         // 获取转发的动态
                         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                        const [forwardMain, _, forwardInfo] = await getDynamicMajor(dynamic.orig, true);
+                        const [forwardMain, forwardInfo] = await getDynamicMajor(dynamic.orig, true);
                         // 拼接main
                         main += /* html */ `
                         <div class="card-forward">
@@ -446,7 +454,6 @@ class GenerateImg extends koishi_1.Service {
                             }
                         }
                     }
-                    link += `请将$替换为. www$bilibili$com/opus/${dynamic.id_str}`;
                     break;
                 }
                 case DYNAMIC_TYPE_AV: {
@@ -519,48 +526,45 @@ class GenerateImg extends koishi_1.Service {
                         </div>
                     </div>
                     `;
-                    link = `请将$替换为. www$bilibili$com/video/${archive.bvid}`;
                     break;
                 }
                 case DYNAMIC_TYPE_LIVE:
-                    return [`${upName}发起了直播预约，我暂时无法渲染，请自行查看`, link];
+                    return [`${upName}发起了直播预约，我暂时无法渲染，请自行查看`];
                 case DYNAMIC_TYPE_MEDIALIST:
-                    return [`${upName}分享了收藏夹，我暂时无法渲染，请自行查看`, link];
+                    return [`${upName}分享了收藏夹，我暂时无法渲染，请自行查看`];
                 case DYNAMIC_TYPE_PGC:
                     return [
                         `${upName}发布了剧集（番剧、电影、纪录片），我暂时无法渲染，请自行查看`,
-                        link,
                     ];
                 case DYNAMIC_TYPE_ARTICLE: {
                     //转发动态屏蔽
                     if (this.giConfig.filter.enable && this.giConfig.filter.article) {
                         throw new Error("已屏蔽专栏动态");
                     }
-                    return [`${upName}投稿了新专栏，我暂时无法渲染，请自行查看`, link];
+                    return [`${upName}投稿了新专栏，我暂时无法渲染，请自行查看`];
                 }
                 case DYNAMIC_TYPE_MUSIC:
-                    return [`${upName}发行了新歌，我暂时无法渲染，请自行查看`, link];
+                    return [`${upName}发行了新歌，我暂时无法渲染，请自行查看`];
                 case DYNAMIC_TYPE_COMMON_SQUARE:
                     return [
                         `${upName}发布了装扮｜剧集｜点评｜普通分享，我暂时无法渲染，请自行查看`,
-                        link,
                     ];
                 case DYNAMIC_TYPE_COURSES_SEASON:
-                    return [`${upName}发布了新课程，我暂时无法渲染，请自行查看`, link];
+                    return [`${upName}发布了新课程，我暂时无法渲染，请自行查看`];
                 case DYNAMIC_TYPE_UGC_SEASON:
-                    return [`${upName}更新了合集，我暂时无法渲染，请自行查看`, link];
+                    return [`${upName}更新了合集，我暂时无法渲染，请自行查看`];
                 case DYNAMIC_TYPE_NONE:
-                    return [`${upName}发布了一条无效动态`, link];
+                    return [`${upName}发布了一条无效动态`];
                 // 直播开播，不做处理
                 case DYNAMIC_TYPE_LIVE_RCMD:
                     throw new Error("直播开播动态，不做处理");
                 default:
-                    return [`${upName}发布了一条我无法识别的动态，请自行查看`, ""];
+                    return [`${upName}发布了一条我无法识别的动态，请自行查看`];
             }
-            return [main, link, forwardInfo];
+            return [main, forwardInfo];
         };
         // 获取动态主要内容
-        const [main, link] = await getDynamicMajor(data, false);
+        const [main] = await getDynamicMajor(data, false);
         // 加载字体
         const fontURL = (0, node_url_1.pathToFileURL)((0, node_path_1.resolve)(__dirname, "font/HYZhengYuan-75W.ttf"));
         // 判断是否开启大字体模式
@@ -674,7 +678,7 @@ class GenerateImg extends koishi_1.Service {
             }
 
             .card .dyn-title {
-                font-size: 27px;
+                font-size: 20px;
                 margin-bottom: 10px;
             }
 
@@ -1048,7 +1052,7 @@ class GenerateImg extends koishi_1.Service {
             }
 
             .card .dyn-title {
-                font-size: 27px;
+                font-size: 20px;
                 margin-bottom: 10px;
             }
 

package/lib/type/index.d.ts

@@ -58,6 +58,17 @@ export type LiveUsers = {
     group: string;
     items: Array<LiveUsersItem>;
 };
+export type RichTextNode = Array<{
+    emoji?: {
+        icon_url: string;
+        size: number;
+        text: string;
+        type: number;
+    };
+    orig_text: string;
+    text: string;
+    type: string;
+}>;
 export type Dynamic = {
     basic: Object;
     id_str: string;
@@ -92,7 +103,27 @@ export type Dynamic = {
         };
         module_dynamic: {
             additional: any;
-            desc: null;
+            desc: {
+                rich_text_nodes: Array<{
+                    orig_text: string;
+                    text: string;
+                    type: string;
+                    emoji: {
+                        icon_url: string;
+                        size: number;
+                        text: string;
+                        type: number;
+                    };
+                    jump_url: string;
+                    rid: string;
+                    goods: {
+                        jump_url: string;
+                        type: number;
+                    };
+                    icon_name: string;
+                }>;
+                text: string;
+            };
             major: {
                 opus: {
                     fold_action: Array<string>;
@@ -105,17 +136,7 @@ export type Dynamic = {
                         width: number;
                     }>;
                     summary: {
-                        rich_text_nodes: Array<{
-                            emoji?: {
-                                icon_url: string;
-                                size: number;
-                                text: string;
-                                type: number;
-                            };
-                            orig_text: string;
-                            text: string;
-                            type: string;
-                        }>;
+                        rich_text_nodes: RichTextNode;
                         text: string;
                     };
                     title: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-alpha.5",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -253,6 +253,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.2.0-alpha.2 修复：直播检测 `API` 模式，请求错误优化(防止不停向QQ发送消息)；
 - ver 3.2.0-alpha.3 优化：增加直播检测 `API` 模式轮询时间，防止被暂时风控；
 - ver 3.2.0-alpha.4 修复：直播卡片推送时间会是设置的 `pushTime` 的两倍；
+- ver 3.2.0-alpha.5 修复：直播检测 `WS` 模式下，直播中推送卡片 `累计观看人数` 位置错误显示为 `粉丝数变化` 、转发动态的留言文字不显示； 优化：直播检测 `API` 模式下，直播推送语 `-watched` 固定显示为 `API模式无法获取`； 
 
 ## 交流群