koishi-plugin-bilibili-notify 2.0.0-alpha.17 → 2.0.0-alpha.19

package/lib/comRegister.js

@@ -677,7 +677,7 @@ class ComRegister {
                 for (const channel of sendArr) {
                     // 判断是否需要推送直播消息
                     if (channel.live) {
-                        await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [content, channel.atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" })] }));
+                        await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [content, channel.atAll ? (0, jsx_runtime_1.jsx)("at", { type: "all" }) : null] }));
                     }
                 }
             }
@@ -1082,7 +1082,7 @@ class ComRegister {
             // 推送直播信息
             // pic 存在，使用的是render模式
             if (pic) {
-                const msg = liveNotifyMsg ? liveNotifyMsg : '';
+                const msg = liveNotifyMsg || '';
                 // 只有在开播时才艾特全体成员
                 if (liveType === LiveType.StartBroadcasting) {
                     return await this.sendMsg(ctx, target, pic + msg, true);
@@ -1091,7 +1091,7 @@ class ComRegister {
                 return await this.sendMsg(ctx, target, pic + msg);
             }
             // pic不存在，说明使用的是page模式
-            const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), liveNotifyMsg && liveNotifyMsg] });
+            const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), liveNotifyMsg || ''] });
             // 只有在开播时才艾特全体成员
             if (liveType === LiveType.StartBroadcasting) {
                 return await this.sendMsg(ctx, target, msg, true);
@@ -1165,9 +1165,14 @@ class ComRegister {
                     if (data.live_status === 1) { // 当前正在直播
                         // 设置开播时间
                         liveTime = data.live_time;
+                        // 设置直播中消息
+                        const liveMsg = this.config.customLive ? this.config.customLive
+                            .replace('-name', username)
+                            .replace('-time', await ctx.gi.getTimeDifference(liveTime))
+                            .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`) : '';
                         // 发送直播通知卡片
                         if (this.config.restartPush)
-                            sendLiveNotifyCard(data, LiveType.LiveBroadcast);
+                            sendLiveNotifyCard(data, LiveType.LiveBroadcast, liveMsg);
                         // 改变开播状态
                         open = true;
                     } // 未开播，直接返回
@@ -1183,9 +1188,9 @@ class ComRegister {
                             // 下播了将定时器清零
                             timer = 0;
                             // 定义下播通知消息
-                            const liveEndMsg = this.config.customLiveEnd
+                            const liveEndMsg = this.config.customLiveEnd ? this.config.customLiveEnd
                                 .replace('-name', username)
-                                .replace('-time', await ctx.gi.getTimeDifference(liveTime));
+                                .replace('-time', await ctx.gi.getTimeDifference(liveTime)) : null;
                             // 更改直播时长
                             data.live_time = liveTime;
                             // 发送@全体成员通知
@@ -1218,11 +1223,11 @@ class ComRegister {
                                     }
                                 }
                             }
-                            // 定义开播通知语
-                            const liveStartMsg = this.config.customLiveStart
+                            // 定义开播通知语                            
+                            const liveStartMsg = this.config.customLiveStart ? this.config.customLiveStart
                                 .replace('-name', username)
                                 .replace('-time', await ctx.gi.getTimeDifference(liveTime))
-                                .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`);
+                                .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`) : null;
                             // 发送消息
                             await sendLiveNotifyCard(data, LiveType.StartBroadcasting, liveStartMsg);
                         }
@@ -1455,9 +1460,7 @@ class ComRegister {
                 // 判断是否订阅直播
                 if (sub.live) {
                     // 订阅直播
-                    liveDispose = ctx.setInterval(() => {
-                        this.liveDetect(ctx, data.live_room.room_id, sub.target);
-                    }, this.config.liveLoopTime * 1000);
+                    liveDispose = ctx.setInterval(this.liveDetect(ctx, data.live_room.roomid, sub.target), this.config.liveLoopTime * 1000);
                 }
             }
             // 在B站中订阅该对象

package/lib/generateImg.js

@@ -176,7 +176,7 @@ class GenerateImg extends koishi_1.Service {
                                 </div>
                                 ${this.giConfig.hideDesc ? '' : `<p class="card-text">${data.description ? data.description : '这个主播很懒，什么都简介都没写'}</p>`}
                                 <p class="card-link">
-                                    ${liveStatus !== 3 && `<span>人气：${data.online > 10000 ? `${(data.online / 10000).toFixed(1)}万` : data.online}</span>`}
+                                    ${liveStatus !== 3 ? `<span>人气：${data.online > 10000 ? `${(data.online / 10000).toFixed(1)}万` : data.online}</span>` : null}
                                     <span>分区名称：${data.area_name}</span>
                                 </p>
                                 <p class="card-link">

package/lib/index.js

@@ -314,6 +314,7 @@ class ServerManager extends koishi_1.Service {
                 restartPush: globalConfig.restartPush,
                 pushTime: globalConfig.pushTime,
                 customLiveStart: globalConfig.customLiveStart,
+                customLive: globalConfig.customLive,
                 customLiveEnd: globalConfig.customLiveEnd,
                 dynamicCheckNumber: globalConfig.dynamicCheckNumber,
                 dynamicLoopTime: this.dynamicLoopTime,

package/package.json

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

package/readme.md

@@ -204,6 +204,8 @@
 - ver 2.0.0-alpha.15 新增：手动订阅功能  修复：一些潜在的bug
 - ver 2.0.0-alpha.16 优化：手动订阅功能
 - ver 2.0.0-alpha.17 修复：直接订阅当前环境不会推送
+- ver 2.0.0-alpha.18 修复：手动订阅无法推送直播通知；自定义直播中通知语不会发送
+- ver 2.0.0-alpha.19 修复：开播通知后带false；下播通知卡片人气位置显示false
 
 ## 交流群