koishi-plugin-bilibili-notify 1.0.1 → 1.0.3

package/lib/biliAPI.d.ts

@@ -23,6 +23,7 @@ declare class BiliAPI extends Service {
     getLoginStatus(qrcodeKey: string): Promise<any>;
     getLiveRoomInfo(roomId: string): Promise<any>;
     getMasterInfo(mid: string): Promise<any>;
+    getUTCPlus8Time(): number;
     disposeNotifier(): void;
     createNewClient(): void;
     getCookies(): string;

package/lib/biliAPI.js

@@ -118,6 +118,12 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
+    getUTCPlus8Time() {
+        // 获取当前时间的UTC+8时间对象
+        const currentTimeInUtc8 = new Date().toLocaleString('en-US', { timeZone: 'Asia/Shanghai' });
+        // 将时间转换为Unix时间戳（单位：秒）
+        return Math.floor(new Date(currentTimeInUtc8).getTime() / 1000);
+    }
     disposeNotifier() { this.loginNotifier && this.loginNotifier.dispose(); }
     createNewClient() {
         this.jar = new tough_cookie_1.CookieJar();

package/lib/comRegister.js

@@ -101,12 +101,20 @@ class ComRegister {
                 console.log(session);
             })
 
+        // ctx.command('test')
+        //     .subcommand('.dynamic <uid:string>')
+        //     .usage('测试动态监测')
+        //     .example('test dynamic uid')
+        //     .action(({ session }, uid) => {
+        //         ctx.setInterval(this.test_dynamicDetect(ctx, session, uid), 30000)
+        //     })
+
         ctx.command('test')
-            .subcommand('.dynamic <uid:string>')
-            .usage('测试动态监测')
-            .example('test dynamic uid')
-            .action(({ session }, uid) => {
-                ctx.setInterval(this.test_dynamicDetect(ctx, session, uid), 30000)
+            .subcommand('.utc')
+            .usage('获取当前UTC+8 Unix时间戳')
+            .example('test utc')
+            .action(() => {
+                console.log(ctx.biliAPI.getUTCPlus8Time());
             }) */
         ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] })
             .subcommand('.login', '登录B站之后才可以进行之后的操作')
@@ -489,7 +497,7 @@ class ComRegister {
             let liveTime = (new Date(data.live_time).getTime()) / 1000;
             const string = await ctx.gimg.generateLiveImg(data, userData, data.live_status !== 1 ?
                 LiveType.NotLiveBroadcast :
-                liveTime < Date.now() ? LiveType.LiveBroadcast : LiveType.StartBroadcasting);
+                LiveType.LiveBroadcast);
             session.send(string);
         });
     }
@@ -507,7 +515,7 @@ class ComRegister {
             // 第一次订阅判断
             if (firstSubscription) {
                 // 设置第一次的时间点
-                timePoint = Math.floor(Date.now() / 1000);
+                timePoint = ctx.biliAPI.getUTCPlus8Time();
                 // 设置第一次为false
                 firstSubscription = false;
                 return;

package/lib/generateImg.d.ts

@@ -19,6 +19,7 @@ declare namespace GenerateImg {
     interface Config {
         cardColorStart: string;
         cardColorEnd: string;
+        font: string;
     }
     const Config: Schema<Config>;
 }

package/lib/generateImg.js

@@ -56,7 +56,7 @@ class GenerateImg extends koishi_1.Service {
             *{
                 margin: 0;
                 padding: 0;
-                font-family: 'HYZhengYuan', Courier;
+                font-family: "${this.config.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
 
             html {
@@ -474,7 +474,7 @@ class GenerateImg extends koishi_1.Service {
             * {
                 margin: 0;
                 padding: 0;
-                font-family: 'HYZhengYuan', Courier;
+                font-family: "${this.config.font}", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
     
             html {
@@ -899,7 +899,7 @@ class GenerateImg extends koishi_1.Service {
         // 获取Unix时间戳（以毫秒为单位）
         const unixTime = date.getTime();
         // 获取当前Unix时间戳
-        const now = Date.now();
+        const now = this.ctx.biliAPI.getUTCPlus8Time();
         // 计算时间差（以秒为单位）
         const differenceInSeconds = Math.floor((now - unixTime) / 1000);
         // 获取yyyy:MM:dd HH:mm:ss
@@ -932,7 +932,8 @@ class GenerateImg extends koishi_1.Service {
         cardColorEnd: koishi_1.Schema.string()
             .pattern(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/)
             .default('#F9CCDF')
-            .description('推送卡片的结束渐变背景色，请填入16进制颜色代码，参考网站：https://colorate.azurewebsites.net/')
+            .description('推送卡片的结束渐变背景色，请填入16进制颜色代码，参考网站：https://colorate.azurewebsites.net/'),
+        font: koishi_1.Schema.string()
     });
 })(GenerateImg || (GenerateImg = {}));
 exports.default = GenerateImg;

package/lib/index.d.ts

@@ -7,6 +7,7 @@ export interface Config {
     dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟';
     cardColorStart: string;
     cardColorEnd: string;
+    font: string;
     key: string;
 }
 export declare const Config: Schema<Config>;

package/lib/index.js

@@ -64,6 +64,8 @@ exports.Config = koishi_1.Schema.object({
         .pattern(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/)
         .default('#F9CCDF')
         .description('推送卡片的结束渐变背景色，请填入16进制颜色代码，参考网站：https://colorate.azurewebsites.net/'),
+    font: koishi_1.Schema.string()
+        .description('推送卡片的字体样式，如果你想用你自己的字体可以在此填写，例如：Microsoft YaHei'),
     key: koishi_1.Schema.string()
         .pattern(/^[0-9a-f]{32}$/)
         .role('secret')
@@ -78,7 +80,7 @@ function apply(ctx, config) {
     ctx.plugin(Database);
     // Regist server
     ctx.plugin(wbi_1.default, { key: config.key });
-    ctx.plugin(generateImg_1.default, { cardColorStart: config.cardColorStart, cardColorEnd: config.cardColorEnd });
+    ctx.plugin(generateImg_1.default, { cardColorStart: config.cardColorStart, cardColorEnd: config.cardColorEnd, font: config.font });
     ctx.plugin(biliAPI_1.default);
     // load plugin
     // ctx.plugin(Authority)

package/package.json

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

package/readme.md

@@ -1,17 +1,17 @@
-<div align="center">
+<center>
 # Bilibili-Botify
-</div>
-
+</center>
 
 基于 [koishi](../../../../koishijs/koishi) 框架的B站推送插件
 
 ---
 
-- **koishi-plugin-bilibili-notify** [![npm](https://img.shields.io/npm/v/koishi-plugin-bilibili-notify?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-bilibili-notify)
+- koishi-plugin-bilibili-notify [![npm](https://img.shields.io/npm/v/koishi-plugin-bilibili-notify?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-bilibili-notify)
   - [功能](#功能)
   - [安装](#安装)
   - [使用方法](#使用方法)
   - [注意事项](#注意事项)
+  - [更新日志](#更新日志)
   - [感谢](#感谢)
   - [License](#License)
 
@@ -79,6 +79,8 @@
 ## 更新日志
 
 ver 1.0.1 修复了一些bug，提供用户自己选择动态检测时间的选项
+ver 1.0.2 修复时间bug和字体乱码问题
+ver 1.0.3 修复了一些bug，提供用户自己选择推送卡片字体样式的选项
 
 ## 感谢