koishi-plugin-bilibili-notify 3.2.5-alpha.11 → 3.2.5-alpha.12

package/lib/index.js

@@ -552,7 +552,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
-	pushRecord = {};
+	pushArrMap = /* @__PURE__ */ new Map();
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -797,7 +797,6 @@ var ComRegister = class {
 		});
 	}
 	initPushRecord(subs) {
-		const pushRecord = {};
 		for (const sub of subs) {
 			const atAllArr = [];
 			const dynamicArr = [];
@@ -809,16 +808,15 @@ var ComRegister = class {
 				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
 			}
-			pushRecord[sub.uid] = {
+			this.pushArrMap.set(sub.uid, {
 				atAllArr,
 				dynamicArr,
 				liveArr,
 				liveGuardBuyArr
-			};
+			});
 		}
-		this.pushRecord = pushRecord;
 		this.logger.info("初始化推送群组/频道信息：");
-		this.logger.info(this.pushRecord);
+		this.logger.info(this.pushArrMap);
 	}
 	checkAllBotsAreReady() {
 		return !this.ctx.bots.some((bot) => bot.status !== koishi.Universal.Status.ONLINE);
@@ -832,7 +830,7 @@ var ComRegister = class {
 			return;
 		}
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
-		const record = this.pushRecord[uid];
+		const record = this.pushArrMap.get(uid);
 		this.logger.info("本次推送目标：");
 		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
 			this.logger.info(record.atAllArr);
@@ -912,15 +910,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -934,7 +932,7 @@ var ComRegister = class {
 						} else dUrl = `${name$3}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$3}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(buffer, "image/jpeg") }), /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: dUrl })] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
@@ -1017,15 +1015,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1044,7 +1042,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(buffer, "image/jpeg") }), /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: dUrl })] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1116,7 +1114,7 @@ var ComRegister = class {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e$1.message}`);
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
-		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
+		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(buffer, "image/jpeg") }), /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: liveNotifyMsg || "" })] });
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async liveDetectWithListener(roomId, uid, cardStyle) {
@@ -1181,7 +1179,15 @@ var ComRegister = class {
 				watchedNum = body.text_small;
 			},
 			onGuardBuy: ({ body }) => {
-				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
+				const content = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [
+					"【",
+					masterInfo.username,
+					"的直播间】",
+					body.user.uname,
+					"加入了大航海（",
+					body.gift_name,
+					"）"
+				] });
 				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -58056,7 +58062,7 @@ var require_helpers$1 = __commonJS$1({ "node_modules/socks/build/common/helpers.
 	}
 	function ipv4ToInt32(ip) {
 		const address = new ip_address_1$1.Address4(ip);
-		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0);
+		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0) >>> 0;
 	}
 	exports.ipv4ToInt32 = ipv4ToInt32;
 	function int32ToIpv4(int32) {

package/lib/index.mjs

@@ -554,7 +554,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
-	pushRecord = {};
+	pushArrMap = /* @__PURE__ */ new Map();
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -799,7 +799,6 @@ var ComRegister = class {
 		});
 	}
 	initPushRecord(subs) {
-		const pushRecord = {};
 		for (const sub of subs) {
 			const atAllArr = [];
 			const dynamicArr = [];
@@ -811,16 +810,15 @@ var ComRegister = class {
 				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
 			}
-			pushRecord[sub.uid] = {
+			this.pushArrMap.set(sub.uid, {
 				atAllArr,
 				dynamicArr,
 				liveArr,
 				liveGuardBuyArr
-			};
+			});
 		}
-		this.pushRecord = pushRecord;
 		this.logger.info("初始化推送群组/频道信息：");
-		this.logger.info(this.pushRecord);
+		this.logger.info(this.pushArrMap);
 	}
 	checkAllBotsAreReady() {
 		return !this.ctx.bots.some((bot) => bot.status !== Universal.Status.ONLINE);
@@ -834,7 +832,7 @@ var ComRegister = class {
 			return;
 		}
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
-		const record = this.pushRecord[uid];
+		const record = this.pushArrMap.get(uid);
 		this.logger.info("本次推送目标：");
 		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
 			this.logger.info(record.atAllArr);
@@ -914,15 +912,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -936,7 +934,7 @@ var ComRegister = class {
 						} else dUrl = `${name$3}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$3}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [/* @__PURE__ */ jsx("message", { children: h.image(buffer, "image/jpeg") }), /* @__PURE__ */ jsx("message", { children: dUrl })] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
@@ -1019,15 +1017,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1046,7 +1044,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [/* @__PURE__ */ jsx("message", { children: h.image(buffer, "image/jpeg") }), /* @__PURE__ */ jsx("message", { children: dUrl })] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1118,7 +1116,7 @@ var ComRegister = class {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e$1.message}`);
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
-		const msg = /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
+		const msg = /* @__PURE__ */ jsxs("message", { children: [/* @__PURE__ */ jsx("message", { children: h.image(buffer, "image/jpeg") }), /* @__PURE__ */ jsx("message", { children: liveNotifyMsg || "" })] });
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async liveDetectWithListener(roomId, uid, cardStyle) {
@@ -1183,7 +1181,15 @@ var ComRegister = class {
 				watchedNum = body.text_small;
 			},
 			onGuardBuy: ({ body }) => {
-				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
+				const content = /* @__PURE__ */ jsxs("message", { children: [
+					"【",
+					masterInfo.username,
+					"的直播间】",
+					body.user.uname,
+					"加入了大航海（",
+					body.gift_name,
+					"）"
+				] });
 				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -58058,7 +58064,7 @@ var require_helpers$1 = __commonJS$1({ "node_modules/socks/build/common/helpers.
 	}
 	function ipv4ToInt32(ip) {
 		const address = new ip_address_1$1.Address4(ip);
-		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0);
+		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0) >>> 0;
 	}
 	exports.ipv4ToInt32 = ipv4ToInt32;
 	function int32ToIpv4(int32) {

package/package.json

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

package/readme.md

@@ -290,6 +290,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.5-alpha.9 测试版本
 > - ver 3.2.5-alpha.10 测试版本
 > - ver 3.2.5-alpha.11 测试版本
+> - ver 3.2.5-alpha.12 测试版本
 
 ## 交流群