koishi-plugin-bilibili-notify 1.2.3-rc.6 → 1.2.3-rc.8

package/lib/comRegister.d.ts

@@ -29,8 +29,8 @@ declare class ComRegister {
     getTheCorrespondingBotBasedOnTheSession(session: Session): Bot<Context, any>;
     sendPrivateMsg(bot: Bot<Context>, content: string): Promise<void>;
     sendPrivateMsgAndRebootService(ctx: Context, bot: Bot<Context>, content: string): Promise<void>;
+    sendMsg(ctx: Context, targets: Array<string>, bot: Bot<Context>, content: any): Promise<void>;
     dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;
-    sendMsg(ctx: Context, targets: Array<string>, bot: Bot<Context>, content: any): Promise<string[]>;
     liveDetect(ctx: Context, bot: Bot<Context>, roomId: string, guildId: Array<string>): () => Promise<void>;
     subShow(): string;
     checkIfNeedSub(comNeed: boolean, subType: string, session: Session, data?: any): Promise<boolean>;

package/lib/comRegister.js

@@ -715,6 +715,40 @@ class ComRegister {
             ctx.sm.registerPlugin();
         }, 1000);
     }
+    async sendMsg(ctx, targets, bot, content) {
+        // 定义需要发送的数组
+        let sendArr = [];
+        // 判断是否需要推送所有机器人加入的群
+        if (targets[0] === 'all') {
+            // 获取所有guild
+            for (let guild of (await bot.getGuildList()).data) {
+                sendArr.push(guild.id);
+            }
+        }
+        else {
+            sendArr = targets;
+        }
+        // 循环给每个群组发送
+        for (let guildId of sendArr) {
+            // 多次尝试发送消息
+            let attempts = 3;
+            for (let i = 0; i < attempts; i++) {
+                try {
+                    // 发送消息
+                    await bot.sendMessage(guildId, content);
+                    // 防止消息发送速度过快被忽略
+                    await ctx.sleep(500);
+                    // 成功发送消息，跳出循环
+                    break;
+                }
+                catch (e) {
+                    if (i === attempts - 1) { // 已尝试三次
+                        throw new Error(`发送群组ID:${guildId}消息失败！原因: ` + e.toString());
+                    }
+                }
+            }
+        }
+    }
     dynamicDetect(ctx, bot, uid, guildId) {
         let firstSubscription = true;
         let timePoint;
@@ -823,37 +857,6 @@ class ComRegister {
             }
         };
     }
-    async sendMsg(ctx, targets, bot, content) {
-        // 定义需要发送的数组
-        let sendArr = [];
-        // 判断是否需要推送所有机器人加入的群
-        if (targets[0] === 'all') {
-            // 获取所有guild
-            for (let guild of (await bot.getGuildList()).data) {
-                sendArr.push(guild.id);
-            }
-        }
-        else {
-            sendArr = targets;
-        }
-        // 循环给每个群组发送
-        for (let guildId of sendArr) {
-            // 多次尝试发送消息
-            let attempts = 3;
-            for (let i = 0; i < attempts; i++) {
-                try {
-                    return await bot.sendMessage(guildId, content);
-                }
-                catch (e) {
-                    if (i === attempts - 1) { // 已尝试三次
-                        throw new Error(`发送群组ID:${guildId}消息失败！原因: ` + e.toString());
-                    }
-                }
-            }
-            // 防止消息发送速度过快被忽略
-            await ctx.sleep(500);
-        }
-    }
     liveDetect(ctx, bot, roomId, guildId) {
         let firstSubscription = true;
         let timer = 0;

package/package.json

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

package/readme.md

@@ -130,7 +130,9 @@
 - ver 1.2.3-rc.3 bug测试版本，请跳过
 - ver 1.2.3-rc.4 bug测试版本，请跳过
 - ver 1.2.3-rc.5 修复了第一次使用插件时，扫码登录后没有任何反应，并且仍提示没有登录的bug
-- ver 1.2.3-rc.6 尝试修复多群推送时部分群未推送的bug
+- ver 1.2.3-rc.6 bug测试版本，请跳过
+- ver 1.2.3-rc.7 尝试修复多群推送时部分群未推送的bug
+- ver 1.2.3-rc.8 修复在 `1.2.3-rc.7` 版本引入的连续推送三次的bug
 
 ## 交流群