llonebot-dist 8.0.6 → 8.0.7

package/llbot.js

@@ -12531,14 +12531,15 @@ var Oidb;
 		msgSeq: ProtoField(3, "uint32"),
 		chatType: ProtoField(4, "uint32"),
 		emojiCode: ProtoField(5, "string"),
-		cookie: ProtoField(6, "bytes"),
+		cookie: ProtoField(6, "string"),
 		field7: ProtoField(7, "uint32"),
 		count: ProtoField(8, "uint32")
 	});
 	_Oidb.FetchEmojiLikesResp = ProtoMessage.of({
 		users: ProtoField(1, { uin: ProtoField(1, "uint32") }, "repeated"),
-		totalCount: ProtoField(3, "uint32", "optional"),
-		hasMore: ProtoField(4, "uint32", "optional")
+		cookie: ProtoField(2, "string"),
+		isLastPage: ProtoField(3, "bool"),
+		isFirstPage: ProtoField(4, "bool")
 	});
 	_Oidb.FlashFileSetIdByCodeReq = ProtoMessage.of({ code: ProtoField(1, "string") });
 	_Oidb.FlashFileSetIdByCodeResp = ProtoMessage.of({ fileSetId: ProtoField(1, "string") });
@@ -19748,7 +19749,7 @@ async function handleGroupJoinRequest(ctx, msg) {
 			initiatorUid: decoded.memberUid,
 			notificationSeq,
 			isDoubt,
-			comment: commit
+			comment: commit ?? ""
 		});
 	} catch (e) {
 		ctx.logger.warn("Failed to parse GroupJoinRequest:", e.message);
@@ -20677,7 +20678,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$3 = "8.0.6";
+var version$3 = "8.0.7";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -31378,24 +31379,27 @@ var GetProfileLikeMe = class extends BaseAction {
 var FetchEmojiLike = class extends BaseAction {
 	actionName = ActionName.FetchEmojiLike;
 	payloadSchema = lib_default$1.object({
-		emoji_id: lib_default$1.string().required(),
 		message_id: lib_default$1.union([Number, String]).required(),
-		count: lib_default$1.union([Number, String]).default(20)
+		emoji_id: lib_default$1.union([Number, String]),
+		emojiId: lib_default$1.union([Number, String]),
+		count: lib_default$1.union([Number, String]).default(20),
+		cookie: lib_default$1.string()
 	});
 	async _handle(payload) {
 		const msgInfo = await this.ctx.store.getMsgInfoByShortId(+payload.message_id);
 		if (!msgInfo) throw new Error("消息不存在");
-		const result = await this.ctx.ntMsgApi.getMsgReactionList(msgInfo.peer, msgInfo.msgSeq, payload.emoji_id, +payload.count);
+		const emojiId = payload.emoji_id ?? payload.emojiId;
+		if (!emojiId) throw new Error("未指定表情 ID");
+		const result = await this.ctx.ntMsgApi.getMsgReactionList(msgInfo.peer, msgInfo.msgSeq, emojiId.toString(), +payload.count, payload.cookie ?? "");
 		return {
-			emojiLikesList: await Promise.all(result.users.map(async (u) => ({
-				uid: await this.ctx.ntUserApi.getUidByUin(u.uin, +msgInfo.peer.peerUid),
-				uin: u.uin.toString(),
+			emojiLikesList: result.users.map((u) => ({
+				tinyId: u.uin.toString(),
 				nickName: "",
 				headUrl: `https://q1.qlogo.cn/g?b=qq&nk=${u.uin}&s=640`
-			}))),
-			cookie: "",
-			isLastPage: !result.hasMore,
-			isFirstPage: true
+			})),
+			cookie: result.cookie,
+			isLastPage: result.isLastPage,
+			isFirstPage: result.isFirstPage
 		};
 	}
 };
@@ -56531,13 +56535,8 @@ var NTMsgApi = class extends Service {
 	async setGroupMsgReaction(groupCode, msgSeq, emojiId, setEmoji, emojiType) {
 		return await this.ctx.qqProtocol.setGroupReaction(groupCode, msgSeq, emojiId, setEmoji, emojiType);
 	}
-	async getMsgReactionList(peer, msgSeq, emojiId, count) {
-		const resp = await this.ctx.qqProtocol.fetchMsgEmojiLikes(+peer.peerUid, msgSeq, emojiId, count);
-		return {
-			users: resp.users ?? [],
-			totalCount: resp.totalCount ?? 0,
-			hasMore: !!resp.hasMore
-		};
+	async getMsgReactionList(peer, msgSeq, emojiId, count, cookie) {
+		return await this.ctx.qqProtocol.fetchMsgEmojiLikes(+peer.peerUid, msgSeq, emojiId, count, cookie);
 	}
 	async recallMsg(peer, msgSeq, clientSeq, msgRandom, msgTime) {
 		if (peer.chatType === ChatType.Group) await this.ctx.qqProtocol.recallGroupMessage(+peer.peerUid, msgSeq);
@@ -73434,13 +73433,12 @@ async function requestSign(cmd, src, seq, guid, qua, uin, protocolToken12B) {
 }
 async function acquireSignToken(uin, qua) {
 	if (!inited) throw new Error("sign not initialized");
-	const r = await acquireSignToken$1({
-		uin,
-		qua
-	});
 	return {
-		token: r.token.toString("utf-8"),
-		ttlSecs: r.ttlSecs
+		token: (await acquireSignToken$1({
+			uin,
+			qua
+		})).token.toString("utf-8"),
+		ttlSecs: 1440 * 60
 	};
 }
 function formatNativeSignError(cmd, qua, e) {
@@ -74240,10 +74238,9 @@ var DirectProtocolClient = class extends EventEmitter {
 				this.signTokenLastFetchAt = Date.now();
 				const { token, ttlSecs } = await acquireSignToken(uin, AppInfo.qua);
 				if (this.session) {
-					const ttlMs = ttlSecs > 0 ? ttlSecs * 1e3 : 1200 * 1e3;
 					this.session.signToken12B = token;
-					this.session.signTokenExpiresAt = Date.now() + ttlMs;
-					console.log(`[SignToken] acquired "${token}" ttl=${ttlSecs > 0 ? ttlSecs + "s" : "default"}`);
+					this.session.signTokenExpiresAt = Date.now() + ttlSecs * 1e3;
+					console.log(`[SignToken] acquired "${token}" ttl=${ttlSecs}s`);
 				}
 			} catch (e) {
 				console.warn(`[SignToken] acquire failed: ${e.message}`);
@@ -75303,7 +75300,10 @@ var QQProtocolBase = class extends Service {
 			try {
 				const nick = await ctx.ntUserApi.getSelfNick(false);
 				this.logger.info(`getSelfNick -> ${JSON.stringify(nick)}`);
-				if (nick) selfInfo.nick = nick;
+				if (nick) {
+					selfInfo.nick = nick;
+					ctx.parallel("llbot/self-nick-changed", { nick });
+				}
 			} catch (e) {
 				this.logger.warn(`getSelfNick threw: ${e.message}`);
 			}
@@ -78043,13 +78043,13 @@ function MessageMixin(Base) {
 			};
 		}
 		/** 拉取消息表情回应用户列表 (OidbSvcTrpcTcp.0x9083_1) */
-		async fetchMsgEmojiLikes(groupCode, msgSeq, emojiCode, count) {
+		async fetchMsgEmojiLikes(groupCode, msgSeq, emojiCode, count, cookie) {
 			const body = Oidb.FetchEmojiLikesReq.encode({
 				groupCode,
 				msgSeq,
 				chatType: 1,
 				emojiCode,
-				cookie: Buffer.alloc(0),
+				cookie,
 				field7: 0,
 				count
 			});
@@ -78668,6 +78668,9 @@ async function onLoad() {
 		};
 		ctx.on("qq/online", handleOnline);
 		if (selfInfo.online && selfInfo.uid) handleOnline();
+		ctx.on("llbot/self-nick-changed", (info) => {
+			setLoginState({ nickname: info.nick });
+		});
 		ctx.on("protocol/disconnect", () => {
 			ctx.logger.info("协议层断开，等待重连…");
 		});
@@ -78680,13 +78683,13 @@ async function onLoad() {
 		});
 		else ctx.qqProtocol.startHook();
 	});
+	process.on("unhandledRejection", (reason) => {
+		ctx.logger.error("[unhandledRejection]", reason);
+	});
+	process.on("uncaughtException", (err) => {
+		ctx.logger.error("[uncaughtException]", err);
+	});
 }
-process.on("unhandledRejection", (reason) => {
-	console.error("[unhandledRejection]", reason);
-});
-process.on("uncaughtException", (err) => {
-	console.error("[uncaughtException]", err);
-});
 onLoad().catch((e) => console.error(e));
 //#endregion
 export {};