koishi-plugin-bilibili-notify 3.1.6 → 3.1.7-alpha.1

package/lib/biliAPI.d.ts

@@ -35,7 +35,7 @@ declare class BiliAPI extends Service {
     copyUserToGroup(mid: string, groupId: string): Promise<any>;
     getUserSpaceDynamic(mid: string): Promise<any>;
     createGroup(tag: string): Promise<any>;
-    getAllDynamic(updateBaseline?: string): Promise<any>;
+    getAllDynamic(): Promise<any>;
     hasNewDynamic(updateBaseline: string): Promise<any>;
     follow(fid: string): Promise<any>;
     getRelationGroupDetail(tagid: string): Promise<any>;

package/lib/biliAPI.js

@@ -25,8 +25,8 @@ const mixinKeyEncTab = [
 ];
 // 在getUserInfo中检测到番剧出差的UID时，要传回的数据：
 const bangumiTripData = { code: 0, data: { live_room: { roomid: 931774 } } };
-const GET_USER_SPACE_DYNAMIC_LIST = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space";
-const GET_ALL_DYNAMIC_LIST = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all";
+const GET_USER_SPACE_DYNAMIC_LIST = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?platform=web&features=itemOpusStyle";
+const GET_ALL_DYNAMIC_LIST = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all?platform=web&features=itemOpusStyle";
 const HAS_NEW_DYNAMIC = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all/update";
 const GET_COOKIES_INFO = "https://passport.bilibili.com/x/passport-login/web/cookie/info";
 const GET_USER_INFO = "https://api.bilibili.com/x/space/wbi/acc/info";
@@ -179,7 +179,7 @@ class BiliAPI extends koishi_1.Service {
         return data;
     }
     async getUserSpaceDynamic(mid) {
-        const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}?host_mid=${mid}`);
+        const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}&host_mid=${mid}`);
         return data;
     }
     async createGroup(tag) {
@@ -193,12 +193,8 @@ class BiliAPI extends koishi_1.Service {
         });
         return data;
     }
-    async getAllDynamic(updateBaseline) {
-        let url = GET_ALL_DYNAMIC_LIST;
-        if (updateBaseline) {
-            url += `?update_baseline=${updateBaseline}`;
-        }
-        const { data } = await this.client.get(url);
+    async getAllDynamic() {
+        const { data } = await this.client.get(GET_ALL_DYNAMIC_LIST);
         return data;
     }
     async hasNewDynamic(updateBaseline) {

package/lib/comRegister.js

@@ -578,7 +578,7 @@ class ComRegister {
                         // 推送该条动态
                         const buffer = await (0, utils_1.withRetry)(async () => {
                             // 渲染图片
-                            return await this.ctx.gi.generateDynamicImg(item, sub.card);
+                            return await this.ctx.gi.generateDynamicImg(item, sub.card.enable ? sub.card : undefined);
                         }, 1).catch(async (e) => {
                             // 直播开播动态，不做处理
                             if (e.message === "直播开播动态，不做处理")
@@ -755,7 +755,7 @@ class ComRegister {
                         // 推送该条动态
                         const buffer = await (0, utils_1.withRetry)(async () => {
                             // 渲染图片
-                            return await this.ctx.gi.generateDynamicImg(item, sub.card);
+                            return await this.ctx.gi.generateDynamicImg(item, sub.card.enable ? sub.card : undefined);
                         }, 1).catch(async (e) => {
                             // 直播开播动态，不做处理
                             if (e.message === "直播开播动态，不做处理")
@@ -926,7 +926,7 @@ class ComRegister {
             // 生成图片
             const buffer = await (0, utils_1.withRetry)(async () => {
                 // 获取直播通知卡片
-                return await this.ctx.gi.generateLiveImg(liveRoomInfo, masterInfo.username, masterInfo.userface, followerDisplay, liveType, cardStyle);
+                return await this.ctx.gi.generateLiveImg(liveRoomInfo, masterInfo.username, masterInfo.userface, followerDisplay, liveType, cardStyle.enable ? cardStyle : undefined);
             }, 1).catch((e) => {
                 this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e.message}`);
             });

package/lib/generateImg.d.ts

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

package/lib/generateImg.js

@@ -214,9 +214,7 @@ class GenerateImg extends koishi_1.Service {
             throw new Error(`生成图片失败！错误: ${e.toString()}`);
         });
     }
-    async generateDynamicImg(
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    data, { cardColorStart = this.giConfig.cardColorStart, cardColorEnd = this.giConfig.cardColorEnd, cardBasePlateColor = this.giConfig.cardBasePlateColor, cardBasePlateBorder = this.giConfig.cardBasePlateBorder, } = {}) {
+    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;
         const avatarUrl = module_author.face;
@@ -240,9 +238,7 @@ class GenerateImg extends koishi_1.Service {
         const topic = data.modules.module_dynamic.topic
             ? data.modules.module_dynamic.topic.name
             : "";
-        const getDynamicMajor = async (
-        // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-        dynamicMajorData, forward) => {
+        const getDynamicMajor = async (dynamic, forward) => {
             // 定义返回值
             let main = "";
             let link = "";
@@ -250,9 +246,9 @@ class GenerateImg extends koishi_1.Service {
             let forwardInfo;
             // 最基本的图文处理
             const basicDynamic = () => {
-                const module_dynamic = dynamicMajorData.modules.module_dynamic;
-                if (module_dynamic.desc) {
-                    const richText = module_dynamic.desc.rich_text_nodes.reduce((accumulator, currentValue) => {
+                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}"/>`;
                         }
@@ -278,6 +274,7 @@ class GenerateImg extends koishi_1.Service {
                     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>
                         `;
@@ -286,13 +283,13 @@ class GenerateImg extends koishi_1.Service {
                 // 图片
                 let major = "";
                 const arrowImg = (0, node_url_1.pathToFileURL)((0, node_path_1.resolve)(__dirname, "img/arrow.png"));
-                if (module_dynamic.major?.draw) {
-                    if (module_dynamic.major.draw.items.length === 1) {
-                        const height = module_dynamic.major.draw.items[0].height;
+                if (module_dynamic.major?.opus.pics) {
+                    if (module_dynamic.major.opus.pics.length === 1) {
+                        const height = module_dynamic.major.opus.pics[0].height;
                         if (height > 3000) {
                             major += /* html */ `
                                 <div class="single-photo-container">
-                                    <img class="single-photo-item" src="${module_dynamic.major.draw.items[0].src}"/>
+                                    <img class="single-photo-item" src="${module_dynamic.major.opus.pics[0].url}"/>
                                     <div class="single-photo-mask">
                                         <span class="single-photo-mask-text">点击链接浏览全部</span>
                                     </div>
@@ -303,19 +300,19 @@ class GenerateImg extends koishi_1.Service {
                         else {
                             major += /* html */ `
                                 <div class="single-photo-container">
-                                    <img class="single-photo-item" src="${module_dynamic.major.draw.items[0].src}"/>
+                                    <img class="single-photo-item" src="${module_dynamic.major.opus.pics[0].url}"/>
                                 </div>
                             `;
                         }
                     }
-                    else if (module_dynamic.major.draw.items.length === 4) {
-                        major += module_dynamic.major.draw.items.reduce((acc, cV) => {
-                            return /* html */ `${acc}<img class="four-photo-item" src="${cV.src}"/>`;
+                    else if (module_dynamic.major.opus.pics.length === 4) {
+                        major += module_dynamic.major.opus.pics.reduce((acc, cV) => {
+                            return /* html */ `${acc}<img class="four-photo-item" src="${cV.url}"/>`;
                         }, "");
                     }
                     else {
-                        major += module_dynamic.major.draw.items.reduce((acc, cV) => {
-                            return /* html */ `${acc}<img class="photo-item" src="${cV.src}"/>`;
+                        major += module_dynamic.major.opus.pics.reduce((acc, cV) => {
+                            return /* html */ `${acc}<img class="photo-item" src="${cV.url}"/>`;
                         }, "");
                     }
                     main += /* html */ `
@@ -326,25 +323,25 @@ class GenerateImg extends koishi_1.Service {
                 }
             };
             // 判断动态类型
-            switch (dynamicMajorData.type) {
+            switch (dynamic.type) {
                 case DYNAMIC_TYPE_WORD:
                 case DYNAMIC_TYPE_DRAW:
                 case DYNAMIC_TYPE_FORWARD: {
                     // DYNAMIC_TYPE_DRAW 带图动态 DYNAMIC_TYPE_WORD 文字动态 DYNAMIC_TYPE_FORWARD 转发动态
                     basicDynamic();
                     // 转发动态
-                    if (dynamicMajorData.type === DYNAMIC_TYPE_FORWARD) {
+                    if (dynamic.type === DYNAMIC_TYPE_FORWARD) {
                         //转发动态屏蔽
                         if (this.giConfig.filter.enable && this.giConfig.filter.forward) {
                             throw new Error("已屏蔽转发动态");
                         }
                         // User info
-                        const forward_module_author = dynamicMajorData.orig.modules.module_author;
+                        const forward_module_author = dynamic.orig.modules.module_author;
                         const forwardUserAvatarUrl = forward_module_author.face;
                         const forwardUserName = forward_module_author.name;
                         // 获取转发的动态
                         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                        const [forwardMain, _, forwardInfo] = await getDynamicMajor(dynamicMajorData.orig, true);
+                        const [forwardMain, _, forwardInfo] = await getDynamicMajor(dynamic.orig, true);
                         // 拼接main
                         main += /* html */ `
                         <div class="card-forward">
@@ -359,8 +356,8 @@ class GenerateImg extends koishi_1.Service {
                         `;
                     }
                     // 判断是否有附加信息
-                    if (dynamicMajorData.modules.module_dynamic.additional) {
-                        const additional = dynamicMajorData.modules.module_dynamic.additional;
+                    if (dynamic.modules.module_dynamic.additional) {
+                        const additional = dynamic.modules.module_dynamic.additional;
                         // 有附加信息，判断类型
                         switch (additional.type) {
                             case ADDITIONAL_TYPE_RESERVE: {
@@ -449,14 +446,14 @@ class GenerateImg extends koishi_1.Service {
                             }
                         }
                     }
-                    link += `请将$替换为. www$bilibili$com/opus/${dynamicMajorData.id_str}`;
+                    link += `请将$替换为. www$bilibili$com/opus/${dynamic.id_str}`;
                     break;
                 }
                 case DYNAMIC_TYPE_AV: {
                     // 投稿新视频
                     // 处理文字
                     basicDynamic();
-                    const archive = dynamicMajorData.modules.module_dynamic.major.archive;
+                    const archive = dynamic.modules.module_dynamic.major.archive;
                     if (archive.badge.text === "投稿视频") {
                         if (forward) {
                             forwardInfo = "投稿了视频";
@@ -676,6 +673,11 @@ class GenerateImg extends koishi_1.Service {
                 top: 24px;
             }
 
+            .card .dyn-title {
+                font-size: 27px;
+                margin-bottom: 10px;
+            }
+
             .card .card-topic {
                 display: flex;
                 align-items: center;
@@ -1045,6 +1047,11 @@ class GenerateImg extends koishi_1.Service {
                 top: 5px;
             }
 
+            .card .dyn-title {
+                font-size: 27px;
+                margin-bottom: 10px;
+            }
+
             .card .card-topic {
                 display: flex;
                 align-items: center;

package/lib/type/index.d.ts

@@ -58,46 +58,110 @@ export type LiveUsers = {
     group: string;
     items: Array<LiveUsersItem>;
 };
-export type AllDynamicInfo = {
-    code: number;
-    message: string;
-    data: {
-        has_more: boolean;
-        items: Array<{
-            id_str: string;
+export type Dynamic = {
+    basic: Object;
+    id_str: string;
+    modules: {
+        module_author: {
+            avatar: Object;
+            decorate: {
+                card_url: string;
+                fan: {
+                    num_str: number;
+                    color: string;
+                };
+            };
+            face: string;
+            face_nft: boolean;
+            following: boolean;
+            jump_url: string;
+            label: string;
+            mid: number;
+            name: string;
+            official_verify: Object;
+            pendant: Object;
+            pub_action: string;
+            pub_action_text: string;
+            pub_location_text: string;
+            pub_time: string;
+            pub_ts: number;
             type: string;
-            modules: {
-                module_author: {
-                    mid: number;
-                    name: string;
-                    face: string;
-                    pub_ts: number;
+            vip: {
+                type: number;
+            };
+        };
+        module_dynamic: {
+            additional: any;
+            desc: null;
+            major: {
+                opus: {
+                    fold_action: Array<string>;
+                    jump_url: string;
+                    pics: Array<{
+                        height: number;
+                        live_url: string;
+                        size: number;
+                        url: string;
+                        width: number;
+                    }>;
+                    summary: {
+                        rich_text_nodes: Array<{
+                            emoji?: {
+                                icon_url: string;
+                                size: number;
+                                text: string;
+                                type: number;
+                            };
+                            orig_text: string;
+                            text: string;
+                            type: string;
+                        }>;
+                        text: string;
+                    };
+                    title: string;
                 };
-                module_dynamic: {
-                    major: {
-                        draw?: {
-                            items: Array<{
-                                src: string;
-                                alt: string;
-                            }>;
-                        };
-                        archive?: {
-                            aid: string;
-                            badge: Object;
-                            bvid: string;
-                            cover: string;
-                            desc: string;
-                            disable_preview: number;
-                            duration_text: string;
-                            jump_url: string;
-                            stat: string;
-                            title: string;
-                            type: number;
-                        };
+                archive: {
+                    jump_url: string;
+                    badge: {
+                        text: string;
+                    };
+                    cover: string;
+                    duration_text: string;
+                    title: string;
+                    desc: string;
+                    stat: {
+                        play: number;
+                        danmaku: number;
                     };
+                    bvid: string;
                 };
+                draw: any;
+                type: string;
             };
-        }>;
+            topic: any;
+        };
+        module_stat: {
+            comment: {
+                count: number;
+            };
+            forward: {
+                count: number;
+            };
+            like: {
+                count: number;
+            };
+        };
+    };
+    orig?: Dynamic;
+    type: string;
+    visible: boolean;
+};
+export type AllDynamicInfo = {
+    code: number;
+    message: string;
+    data: {
+        has_more: boolean;
+        items: Array<Dynamic>;
         offset: string;
         update_baseline: string;
         update_num: number;

package/package.json

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

package/readme.md

@@ -243,6 +243,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.1.5-alpha.3 修复：动态推送时报错：dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：Cannot read properties of undefined (reading 'card')；
 - ver 3.1.5 修复：非 `debug` 模式下动态推送，如果在一个监测周期内同一个订阅的up主发送多条动态，下一个监测周期会重复推送;
 - ver 3.1.6 修复：视频类动态推送时，发送的视频链接有误；
+- ver 3.1.7-alpha.0 修复：登录账号和订阅账号是同一个账号，动态不会推送，使用 `bili dyn` 指令，纯文本动态会被跳过； 新增：动态标题；
+- ver 3.1.7-alpha.1 修复：启用自定义卡片样式后取消仍是自定义样式；
 
 ## 交流群