koishi-plugin-bilibili-notify 3.0.0-alpha.13 → 3.0.0-alpha.15

package/lib/biliAPI.d.ts

@@ -67,7 +67,6 @@ declare class BiliAPI extends Service {
     disposeNotifier(): void;
     getRandomUserAgent(): string;
     createNewClient(): void;
-    getTimeOfUTC8(): number;
     getCookies(): string;
     getCookiesForHeader(): Promise<string>;
     getLoginInfoIsLoaded(): boolean;

package/lib/biliAPI.js

@@ -16,7 +16,6 @@ const axios_1 = __importDefault(require("axios"));
 const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
 const jsdom_1 = require("jsdom");
-const luxon_1 = require("luxon");
 const retry_1 = __importDefault(require("./utils/retry"));
 const mixinKeyEncTab = [
     46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
@@ -297,9 +296,6 @@ class BiliAPI extends koishi_1.Service {
             },
         }));
     }
-    getTimeOfUTC8() {
-        return Math.floor(luxon_1.DateTime.now().setZone("UTC+8").toSeconds());
-    }
     getCookies() {
         const cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;

package/lib/comRegister.js

@@ -7,6 +7,9 @@ const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 const koishi_1 = require("koishi");
 // 导入qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
+// 弹幕词云
+// TODO:WorlCloud
+// import { Segment } from "segmentit";
 var LiveType;
 (function (LiveType) {
     LiveType[LiveType["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
@@ -16,7 +19,7 @@ var LiveType;
 })(LiveType || (LiveType = {}));
 class ComRegister {
     // 必须服务
-    static inject = ["ba", "gi", "database", "canvas", "bl", "sm"];
+    static inject = ["ba", "gi", "database", "bl", "sm"];
     // 定义数组：QQ相关bot
     qqRelatedBotList = [
         "qq",
@@ -692,8 +695,8 @@ class ComRegister {
         this.checkIfDynamicDetectIsNeeded();
         // 在控制台中显示订阅对象
         this.updateSubNotifier();
-        // Test
-        const testTarget = [
+        /* // Test
+        const testTarget: Target = [
             {
                 channelIdArr: [
                     {
@@ -707,8 +710,9 @@ class ComRegister {
                 platform: "qqguild",
             },
         ];
+
         const buffer = await this.ctx.gi.generateWordCloudImg();
-        this.sendMsg(testTarget, koishi_1.h.image(buffer, "image/png"));
+        this.sendMsg(testTarget, h.image(buffer, "image/png")); */
     }
     splitMultiPlatformStr(str) {
         return str

package/lib/database.d.ts

@@ -1,5 +1,5 @@
-import { Context } from "koishi";
-declare module 'koishi' {
+import type { Context } from "koishi";
+declare module "koishi" {
     interface Tables {
         bilibili: Bilibili;
         loginBili: LoginBili;

package/lib/database.js

@@ -2,24 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.name = void 0;
 exports.apply = apply;
-exports.name = 'Database';
+exports.name = "Database";
 function apply(ctx) {
     // 新增Bilibili表
-    ctx.model.extend('bilibili', {
-        id: 'unsigned',
-        uid: 'string',
-        room_id: 'string',
-        dynamic: 'unsigned',
-        live: 'unsigned',
-        target: 'string',
-        platform: 'string',
-        time: 'timestamp'
+    ctx.model.extend("bilibili", {
+        id: "unsigned",
+        uid: "string",
+        room_id: "string",
+        dynamic: "unsigned",
+        live: "unsigned",
+        target: "string",
+        platform: "string",
+        time: "timestamp",
     }, { autoInc: true });
     // 新增LoginBili表
-    ctx.model.extend('loginBili', {
-        id: 'unsigned',
-        bili_cookies: 'text',
-        bili_refresh_token: 'text',
-        dynamic_group_id: 'string'
+    ctx.model.extend("loginBili", {
+        id: "unsigned",
+        bili_cookies: "text",
+        bili_refresh_token: "text",
+        dynamic_group_id: "string",
     });
 }

package/lib/generateImg.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const koishi_1 = require("koishi");
+const luxon_1 = require("luxon");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 // 动态类型
@@ -1487,22 +1488,39 @@ class GenerateImg extends koishi_1.Service {
     }
     async getTimeDifference(dateString) {
         // 将日期字符串转换为Date对象
-        const date = new Date(dateString);
-        // 获取Unix时间戳（以毫秒为单位）
-        const unixTime = date.getTime() / 1000;
-        // 获取当前Unix时间戳
-        const now = this.ctx.ba.getTimeOfUTC8();
-        // 计算时间差（以秒为单位）
-        const differenceInSeconds = Math.floor(now - unixTime);
-        // 获取yyyy:MM:dd HH:mm:ss
-        const days = Math.floor(differenceInSeconds / (24 * 60 * 60));
-        const hours = Math.floor((differenceInSeconds % (24 * 60 * 60)) / (60 * 60));
-        const minutes = Math.floor((differenceInSeconds % (60 * 60)) / 60);
-        const seconds = differenceInSeconds % 60;
-        // 返回格式化的字符串
-        return days
-            ? `${days}天${hours}小时${minutes.toString().padStart(2, "0")}分${seconds.toString().padStart(2, "0")}秒`
-            : `${hours}小时${minutes.toString().padStart(2, "0")}分${seconds.toString().padStart(2, "0")}秒`;
+        const apiDateTime = luxon_1.DateTime.fromFormat(dateString, "yyyy-MM-dd HH:mm:ss", {
+            zone: "UTC+8",
+        });
+        // 获取当前时间
+        const currentDateTime = luxon_1.DateTime.now();
+        // 计算时间差
+        const diff = currentDateTime.diff(apiDateTime, [
+            "years",
+            "months",
+            "days",
+            "hours",
+            "minutes",
+            "seconds",
+        ]);
+        const { years, months, days, hours, minutes, seconds } = diff.toObject();
+        // 按单位生成可读字符串（过滤零值）
+        const parts = [];
+        if (years !== 0)
+            parts.push(`${Math.abs(years)}年`);
+        if (months !== 0)
+            parts.push(`${Math.abs(months)}个月`);
+        if (days !== 0)
+            parts.push(`${Math.abs(days)}天`);
+        if (hours !== 0)
+            parts.push(`${Math.abs(hours)}小时`);
+        if (minutes !== 0)
+            parts.push(`${Math.abs(minutes)}分`);
+        if (seconds !== 0)
+            parts.push(`${Math.abs(seconds)}秒`);
+        // 处理负值
+        const sign = diff.as("seconds") < 0 ? "" : "-";
+        // 组合结果（如果无差值返回"0秒"）
+        return parts.length > 0 ? `${sign}${parts.join("")}` : "0秒";
     }
     unixTimestampToString(timestamp) {
         const date = new Date(timestamp * 1000);

package/lib/index.js

@@ -46,7 +46,7 @@ const Database = __importStar(require("./database"));
 const generateImg_1 = __importDefault(require("./generateImg"));
 const biliAPI_1 = __importDefault(require("./biliAPI"));
 const blive_1 = __importDefault(require("./blive"));
-exports.inject = ["puppeteer", "canvas", "database", "notifier"];
+exports.inject = ["puppeteer", "database", "notifier"];
 exports.name = "bilibili-notify";
 let globalConfig;
 class ServerManager extends koishi_1.Service {

package/package.json

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

package/readme.md

@@ -224,7 +224,9 @@
 - ver 3.0.0-alpha.10 修复：连续推送两次开播通知
 - ver 3.0.0-alpha.11 新增：直播结束后推送弹幕词云，直播推送上舰消息； 修复：直播推送都是同一张画面； 移除：直播推送弹幕消息
 - ver 3.0.0-alpha.12 修复：上一版本无法安装
-- ver 3.0.0-alpha.13 优化：将ESLint替换为Biome； 修复：增加弹幕词云功能产生的bug； 禁用：弹幕词云功能并不难正常运作，暂时将该功能禁用
+- ver 3.0.0-alpha.13 优化：将ESLint替换为Biome； 修复：增加弹幕词云功能产生的bug； 禁用：弹幕词云功能并不能正常运作，暂时将该功能禁用
+- ver 3.0.0-alpha.14 优化：移除不需要的服务
+- ver 3.0.0-alpha.15 修复：启动插件提示发送群组消息失败、直播推送时间显示为负数(不用再特别设置系统时区为UTC+8)
 
 ## 交流群