koishi-plugin-bilibili-notify 3.3.9 → 3.3.10

package/lib/index.js

@@ -1610,7 +1610,7 @@ var ComRegister$1 = class {
 		};
 	}
 	async subUserInBili(mid) {
-		for (const user of this.groupInfo) if (user.mid === mid) return {
+		for (const user of this.groupInfo) if (user.mid.toString() === mid) return {
 			code: 0,
 			message: "订阅对象已存在于分组中"
 		};
@@ -1699,6 +1699,19 @@ var ComRegister$1 = class {
 		this.preInitConfig(subs);
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
+			const subInfo = await this.subUserInBili(sub.uid);
+			if (subInfo.code !== 0 && subInfo.code !== 22015) return subInfo;
+			if (subInfo.code === 22015) this.logger.warn(`账号异常，无法进行订阅操作，请手动订阅 UID:${sub.uid} 备注:${sub.uname}`);
+			this.subManager.set(sub.uid, {
+				uname: sub.uname,
+				roomId: sub.roomid,
+				target: sub.target,
+				live: sub.live,
+				dynamic: sub.dynamic,
+				customCardStyle: sub.customCardStyle,
+				customLiveMsg: sub.customLiveMsg,
+				customLiveSummary: sub.customLiveSummary
+			});
 			if (sub.live && !sub.roomid) {
 				this.logger.info(`UID:${sub.uid} 请求了用户接口~`);
 				const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
@@ -1730,18 +1743,6 @@ var ComRegister$1 = class {
 				sub.roomid = userInfoData.live_room?.roomid;
 			}
 			if (sub.live && sub.roomid && this.config.liveDetectType === "WS") await this.liveDetectWithListener(sub);
-			const subInfo = await this.subUserInBili(sub.uid);
-			if (subInfo.code !== 0) return subInfo;
-			this.subManager.set(sub.uid, {
-				uname: sub.uname,
-				roomId: sub.roomid,
-				target: sub.target,
-				live: sub.live,
-				dynamic: sub.dynamic,
-				customCardStyle: sub.customCardStyle,
-				customLiveMsg: sub.customLiveMsg,
-				customLiveSummary: sub.customLiveSummary
-			});
 			this.logger.info(`UID:${sub.uid} 订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
 				const randomDelay = Math.floor(Math.random() * 3) + 1;
@@ -3853,8 +3854,8 @@ var BiliAPI$1 = class extends koishi.Service {
 			headers: {
 				"Content-Type": "application/json",
 				"User-Agent": this.apiConfig.userAgent || "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0",
-				Origin: "https://space.bilibili.com",
-				Referer: "https://space.bilibili.com/",
+				Origin: "https://www.bilibili.com",
+				Referer: "https://www.bilibili.com/",
 				priority: "u=1, i",
 				"sec-ch-ua": "\"Not;A=Brand\";v=\"99\", \"Google Chrome\";v=\"139\", \"Chromium\";v=\"139\"",
 				"sec-ch-ua-mobile": "?0",

package/lib/index.mjs

@@ -1592,7 +1592,7 @@ var ComRegister$1 = class {
 		};
 	}
 	async subUserInBili(mid) {
-		for (const user of this.groupInfo) if (user.mid === mid) return {
+		for (const user of this.groupInfo) if (user.mid.toString() === mid) return {
 			code: 0,
 			message: "订阅对象已存在于分组中"
 		};
@@ -1681,6 +1681,19 @@ var ComRegister$1 = class {
 		this.preInitConfig(subs);
 		for (const sub of Object.values(subs)) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
+			const subInfo = await this.subUserInBili(sub.uid);
+			if (subInfo.code !== 0 && subInfo.code !== 22015) return subInfo;
+			if (subInfo.code === 22015) this.logger.warn(`账号异常，无法进行订阅操作，请手动订阅 UID:${sub.uid} 备注:${sub.uname}`);
+			this.subManager.set(sub.uid, {
+				uname: sub.uname,
+				roomId: sub.roomid,
+				target: sub.target,
+				live: sub.live,
+				dynamic: sub.dynamic,
+				customCardStyle: sub.customCardStyle,
+				customLiveMsg: sub.customLiveMsg,
+				customLiveSummary: sub.customLiveSummary
+			});
 			if (sub.live && !sub.roomid) {
 				this.logger.info(`UID:${sub.uid} 请求了用户接口~`);
 				const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
@@ -1712,18 +1725,6 @@ var ComRegister$1 = class {
 				sub.roomid = userInfoData.live_room?.roomid;
 			}
 			if (sub.live && sub.roomid && this.config.liveDetectType === "WS") await this.liveDetectWithListener(sub);
-			const subInfo = await this.subUserInBili(sub.uid);
-			if (subInfo.code !== 0) return subInfo;
-			this.subManager.set(sub.uid, {
-				uname: sub.uname,
-				roomId: sub.roomid,
-				target: sub.target,
-				live: sub.live,
-				dynamic: sub.dynamic,
-				customCardStyle: sub.customCardStyle,
-				customLiveMsg: sub.customLiveMsg,
-				customLiveSummary: sub.customLiveSummary
-			});
 			this.logger.info(`UID:${sub.uid} 订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
 				const randomDelay = Math.floor(Math.random() * 3) + 1;
@@ -3835,8 +3836,8 @@ var BiliAPI$1 = class extends Service {
 			headers: {
 				"Content-Type": "application/json",
 				"User-Agent": this.apiConfig.userAgent || "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0",
-				Origin: "https://space.bilibili.com",
-				Referer: "https://space.bilibili.com/",
+				Origin: "https://www.bilibili.com",
+				Referer: "https://www.bilibili.com/",
 				priority: "u=1, i",
 				"sec-ch-ua": "\"Not;A=Brand\";v=\"99\", \"Google Chrome\";v=\"139\", \"Chromium\";v=\"139\"",
 				"sec-ch-ua-mobile": "?0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "main": "./lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [