llonebot-dist 7.12.14 → 7.12.15

package/llbot.js

@@ -1,10 +1,10 @@
 import { createRequire } from "node:module";
 import * as path$4 from "node:path";
 import path, { dirname, join } from "node:path";
-import fs, { copyFile, mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
-import fs$1, { existsSync } from "fs";
-import * as fs$6 from "node:fs";
-import fs$2, { appendFile, appendFileSync, createReadStream, existsSync as existsSync$1, mkdirSync, promises, stat as stat$1, statSync, watch } from "node:fs";
+import fsPromise, { copyFile, mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
+import fs, { existsSync } from "fs";
+import * as fs$5 from "node:fs";
+import fs$1, { appendFile, appendFileSync, createReadStream, existsSync as existsSync$1, mkdirSync, promises, stat as stat$1, statSync, watch } from "node:fs";
 import os from "node:os";
 import { Binary, Time, camelize, clone, deduplicate, deepEqual, defineProperty, difference, filterKeys, hyphenate, is, isNonNullable, isNullable, isPlainObject, makeArray, mapValues, noop, omit, pick, remove, valueMap } from "cosmokit";
 import { Exporter, Factory } from "reggol";
@@ -21,7 +21,7 @@ import http, { STATUS_CODES, createServer, request } from "node:http";
 import { Http2ServerRequest, constants as constants$1 } from "node:http2";
 import { Readable, Transform } from "node:stream";
 import { deflateSync, gunzipSync, gzipSync, inflateSync } from "node:zlib";
-import fsPromise, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
+import fsPromise$1, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
 import { inspect, isDeepStrictEqual } from "node:util";
 import net, { connect } from "node:net";
 import https from "node:https";
@@ -3973,7 +3973,7 @@ var require_utils$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#endregion
 //#region node_modules/qrcode/lib/renderer/png.js
 var require_png = /* @__PURE__ */ __commonJSMin(((exports) => {
-	var fs$11 = __require("fs");
+	var fs$10 = __require("fs");
 	var PNG = require_png$1().PNG;
 	var Utils = require_utils$1();
 	exports.render = function render(qrData, options) {
@@ -4025,7 +4025,7 @@ var require_png = /* @__PURE__ */ __commonJSMin(((exports) => {
 			called = true;
 			cb.apply(null, args);
 		};
-		const stream = fs$11.createWriteStream(path);
+		const stream = fs$10.createWriteStream(path);
 		stream.on("error", done);
 		stream.on("close", done);
 		exports.renderToFileStream(stream, qrData, options);
@@ -6611,7 +6611,7 @@ async function logSummaryMessage(ctx, message) {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$10 = __require("fs");
+	var fs$9 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -6628,12 +6628,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$10.stat(path, function(er, stat) {
+		fs$9.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$10.statSync(path), path, options);
+		return checkStat(fs$9.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -6641,14 +6641,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$9 = __require("fs");
+	var fs$8 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$9.stat(path, function(er, stat) {
+		fs$8.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$9.statSync(path), options);
+		return checkStat(fs$8.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -9140,7 +9140,7 @@ var require_processor = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region node_modules/fluent-ffmpeg/lib/capabilities.js
 var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var fs$8 = __require("fs");
+	var fs$7 = __require("fs");
 	var path$7 = __require("path");
 	var async = require_async();
 	var utils = require_utils();
@@ -9216,7 +9216,7 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		proto._getFfmpegPath = function(callback) {
 			if ("ffmpegPath" in cache) return callback(null, cache.ffmpegPath);
 			async.waterfall([function(cb) {
-				if (process.env.FFMPEG_PATH) fs$8.exists(process.env.FFMPEG_PATH, function(exists) {
+				if (process.env.FFMPEG_PATH) fs$7.exists(process.env.FFMPEG_PATH, function(exists) {
 					if (exists) cb(null, process.env.FFMPEG_PATH);
 					else cb(null, "");
 				});
@@ -9247,7 +9247,7 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if ("ffprobePath" in cache) return callback(null, cache.ffprobePath);
 			async.waterfall([
 				function(cb) {
-					if (process.env.FFPROBE_PATH) fs$8.exists(process.env.FFPROBE_PATH, function(exists) {
+					if (process.env.FFPROBE_PATH) fs$7.exists(process.env.FFPROBE_PATH, function(exists) {
 						cb(null, exists ? process.env.FFPROBE_PATH : "");
 					});
 					else cb(null, "");
@@ -9265,7 +9265,7 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						else if (ffmpeg.length) {
 							var name = utils.isWindows ? "ffprobe.exe" : "ffprobe";
 							var ffprobe = path$7.join(path$7.dirname(ffmpeg), name);
-							fs$8.exists(ffprobe, function(exists) {
+							fs$7.exists(ffprobe, function(exists) {
 								cb(null, exists ? ffprobe : "");
 							});
 						} else cb(null, "");
@@ -9290,14 +9290,14 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if ("flvtoolPath" in cache) return callback(null, cache.flvtoolPath);
 			async.waterfall([
 				function(cb) {
-					if (process.env.FLVMETA_PATH) fs$8.exists(process.env.FLVMETA_PATH, function(exists) {
+					if (process.env.FLVMETA_PATH) fs$7.exists(process.env.FLVMETA_PATH, function(exists) {
 						cb(null, exists ? process.env.FLVMETA_PATH : "");
 					});
 					else cb(null, "");
 				},
 				function(flvtool, cb) {
 					if (flvtool.length) return cb(null, flvtool);
-					if (process.env.FLVTOOL2_PATH) fs$8.exists(process.env.FLVTOOL2_PATH, function(exists) {
+					if (process.env.FLVTOOL2_PATH) fs$7.exists(process.env.FLVTOOL2_PATH, function(exists) {
 						cb(null, exists ? process.env.FLVTOOL2_PATH : "");
 					});
 					else cb(null, "");
@@ -9802,7 +9802,7 @@ var require_ffprobe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region node_modules/fluent-ffmpeg/lib/recipes.js
 var require_recipes = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var fs$7 = __require("fs");
+	var fs$6 = __require("fs");
 	var path$6 = __require("path");
 	var PassThrough$4 = __require("stream").PassThrough;
 	var async = require_async();
@@ -10008,8 +10008,8 @@ var require_recipes = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					next(null, filenames);
 				},
 				function createDirectory(filenames, next) {
-					fs$7.exists(config.folder, function(exists) {
-						if (!exists) fs$7.mkdir(config.folder, function(err) {
+					fs$6.exists(config.folder, function(exists) {
+						if (!exists) fs$6.mkdir(config.folder, function(err) {
 							if (err) next(err);
 							else next(null, filenames);
 						});
@@ -10257,7 +10257,7 @@ function setFFMpegPath(ffmpegPath) {
 		path.join(import.meta.dirname, "ffmpeg.exe"),
 		process.env["FFMPEG_PATH"] || ""
 	];
-	for (const p of paths) if (fs$2.existsSync(p)) {
+	for (const p of paths) if (fs$1.existsSync(p)) {
 		import_fluent_ffmpeg.default.setFfmpegPath(p);
 		console.log("set ffmpeg successfully", p);
 		break;
@@ -11364,7 +11364,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.14";
+var version$2 = "7.12.15";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -17022,7 +17022,7 @@ var processQueue = async () => {
 	const promises = queue.splice(0, concurrency).map(async ({ filePath, resolve, reject }) => {
 		let handle;
 		try {
-			handle = await fs$6.promises.open(path$4.resolve(filePath), "r");
+			handle = await fs$5.promises.open(path$4.resolve(filePath), "r");
 		} catch (err) {
 			return reject(err);
 		}
@@ -17069,7 +17069,7 @@ function checkUriType(uri) {
 	if (uri.startsWith("data:")) return { type: FileUriType.DataURL };
 	if (uri.startsWith("http://") || uri.startsWith("https://")) return { type: FileUriType.RemoteURL };
 	if (uri.startsWith("file://")) return { type: FileUriType.FileURL };
-	if (fs$2.existsSync(uri)) return { type: FileUriType.Path };
+	if (fs$1.existsSync(uri)) return { type: FileUriType.Path };
 	return { type: FileUriType.Unknown };
 }
 async function fetchFile(url, headersInit) {
@@ -17099,7 +17099,7 @@ async function uri2local(ctx, uri, needExt) {
 	const { type } = checkUriType(uri);
 	if (type === FileUriType.FileURL) {
 		const filePath = fileURLToPath(uri);
-		if (!fs$2.existsSync(filePath)) return {
+		if (!fs$1.existsSync(filePath)) return {
 			success: false,
 			errMsg: "路径不存在",
 			fileName: "",
@@ -17125,12 +17125,12 @@ async function uri2local(ctx, uri, needExt) {
 		const res = await fetchFile(uri);
 		let fileName = randomUUID();
 		let filePath = path.join(TEMP_DIR, fileName);
-		await fs.writeFile(filePath, res.data);
+		await fsPromise.writeFile(filePath, res.data);
 		if (needExt) {
 			const ext = (await getFileType(filePath)).ext;
 			fileName += `.${ext}`;
 			const newPath = `${filePath}.${ext}`;
-			await fs.rename(filePath, newPath);
+			await fsPromise.rename(filePath, newPath);
 			filePath = newPath;
 		}
 		return {
@@ -17153,11 +17153,11 @@ async function uri2local(ctx, uri, needExt) {
 		let filename = randomUUID();
 		let filePath = path.join(TEMP_DIR, filename);
 		const base64 = uri.replace(/^base64:\/\//, "");
-		await fs.writeFile(filePath, base64, "base64");
+		await fsPromise.writeFile(filePath, base64, "base64");
 		if (needExt) {
 			const ext = (await getFileType(filePath)).ext;
 			filename += `.${ext}`;
-			await fs.rename(filePath, `${filePath}.${ext}`);
+			await fsPromise.rename(filePath, `${filePath}.${ext}`);
 			filePath = `${filePath}.${ext}`;
 		}
 		return {
@@ -17174,11 +17174,11 @@ async function uri2local(ctx, uri, needExt) {
 			let filename = randomUUID();
 			const [, _type, base64] = capture;
 			let filePath = path.join(TEMP_DIR, filename);
-			await fs.writeFile(filePath, base64, "base64");
+			await fsPromise.writeFile(filePath, base64, "base64");
 			if (needExt) {
 				const ext = (await getFileType(filePath)).ext;
 				filename += `.${ext}`;
-				await fs.rename(filePath, `${filePath}.${ext}`);
+				await fsPromise.rename(filePath, `${filePath}.${ext}`);
 				filePath = `${filePath}.${ext}`;
 			}
 			return {
@@ -17249,13 +17249,13 @@ function getSha1HexFromBuffer(buf) {
 }
 async function getMd5HexFromFile(filePath) {
 	const hash = createHash("md5");
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest("hex");
 }
 async function getSha1HexFromFile(filePath) {
 	const hash = createHash("sha1");
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest("hex");
 }
@@ -17264,13 +17264,13 @@ function getMd5BufferFromBuffer(buf) {
 }
 async function getMd5BufferFromFile(filePath) {
 	const hash = createHash("md5");
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest();
 }
 async function getSha1BufferFromFile(filePath) {
 	const hash = createHash("sha1");
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest();
 }
@@ -17506,7 +17506,7 @@ async function calculateSha1StreamBytes(filePath) {
 	let bytesRead = 0;
 	let nextBlockBoundary = blockSize;
 	const byteArrayList = [];
-	const readable = fs$2.createReadStream(filePath);
+	const readable = fs$1.createReadStream(filePath);
 	for await (const chunk of readable) {
 		let buf;
 		if (tail.length > 0) {
@@ -17531,7 +17531,7 @@ async function calculateSha1StreamBytes(filePath) {
 }
 async function readAndHash10M(filePath) {
 	const maxSize = 10002432;
-	const fd = await fs.open(filePath, "r");
+	const fd = await fsPromise.open(filePath, "r");
 	const buffer = Buffer.allocUnsafe(maxSize);
 	const { bytesRead } = await fd.read(buffer, 0, maxSize, 0);
 	await fd.close();
@@ -17573,13 +17573,13 @@ var TriSha1 = class {
 };
 async function calculateTriSha1(filePath, fileSize) {
 	const hash = new TriSha1(fileSize);
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.finalize();
 }
 var defaultVideoThumb = Buffer.from("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", "base64");
 async function getVideoInfo(filePath) {
-	const size = fs$2.statSync(filePath).size;
+	const size = fs$1.statSync(filePath).size;
 	return new Promise((resolve, reject) => {
 		(0, import_fluent_ffmpeg.default)(filePath).ffprobe((err, metadata) => {
 			if (err) reject(err);
@@ -17656,7 +17656,7 @@ function convert(ctx, input, options, outputPath) {
 	});
 }
 async function encodeSilk(ctx, filePath) {
-	const file = await fs.readFile(filePath);
+	const file = await fsPromise.readFile(filePath);
 	if (!isSilk(file)) {
 		ctx.logger.info(`语音文件${filePath}需要转换成silk`);
 		let result;
@@ -17675,7 +17675,7 @@ async function encodeSilk(ctx, filePath) {
 			"-f s16le"
 		] }), 24e3);
 		const pttPath = path.join(TEMP_DIR, randomUUID());
-		await fs.writeFile(pttPath, result.data);
+		await fsPromise.writeFile(pttPath, result.data);
 		ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration);
 		return {
 			converted: true,
@@ -17698,11 +17698,11 @@ async function encodeSilk(ctx, filePath) {
 	}
 }
 async function decodeSilk(ctx, inputFilePath, outFormat) {
-	const { data } = await decode(await fs.readFile(inputFilePath), 24e3);
+	const { data } = await decode(await fsPromise.readFile(inputFilePath), 24e3);
 	const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath));
 	const outFilePath = tmpPath + `.${outFormat}`;
 	const pcmFilePath = tmpPath + ".pcm";
-	await fs.writeFile(pcmFilePath, data);
+	await fsPromise.writeFile(pcmFilePath, data);
 	return convert(ctx, pcmFilePath, { input: [
 		"-f s16le",
 		"-ar 24000",
@@ -18378,7 +18378,7 @@ async function handleMsg(ctx, msg, quickAction) {
 async function handleFriendRequest$1(ctx, request, quickAction) {
 	if (!isNullable(quickAction.approve)) {
 		await ctx.ntFriendApi.approvalFriendRequest(request.flag, quickAction.approve).catch((e) => ctx.logger.error(e));
-		if (!isNullable(quickAction.remark)) ctx.ntFriendApi.setBuddyRemark(request.flag, quickAction.remark).catch((e) => ctx.logger.error(e));
+		if (!isNullable(quickAction.remark)) await ctx.ntFriendApi.setFriendRemark(request.flag, quickAction.remark).catch((e) => ctx.logger.error(e));
 	}
 }
 async function handleGroupRequest(ctx, request, quickAction) {
@@ -23781,6 +23781,71 @@ var Oidb;
 		jumpUrl: ProtoField(3, "string")
 	});
 	_Oidb.GetFriendRecommendContactArkResp = ProtoMessage.of({ ark: ProtoField(1, "string") });
+	_Oidb.SetFriendRemarkReq = ProtoMessage.of({
+		uid: ProtoField(1, "string"),
+		remark: ProtoField(2, "string")
+	});
+	_Oidb.DeleteFriendReq = ProtoMessage.of({ field1: ProtoField(1, {
+		targetUid: ProtoField(1, "string"),
+		field2: ProtoField(2, {
+			field1: ProtoField(1, "uint32"),
+			field2: ProtoField(2, "uint32"),
+			field3: ProtoField(3, {
+				field1: ProtoField(1, "uint32"),
+				field2: ProtoField(2, "uint32"),
+				field3: ProtoField(3, "uint32")
+			})
+		}),
+		block: ProtoField(3, "bool"),
+		bothDelete: ProtoField(4, "bool")
+	}) });
+	_Oidb.SetFriendCategoryReq = ProtoMessage.of({
+		uid: ProtoField(1, "string"),
+		categoryId: ProtoField(2, "uint32")
+	});
+	_Oidb.FetchFriendRequestsReq = ProtoMessage.of({
+		version: ProtoField(1, "int32"),
+		type: ProtoField(3, "int32"),
+		selfUid: ProtoField(4, "string"),
+		startIndex: ProtoField(5, "int32"),
+		reqNum: ProtoField(6, "int32"),
+		getFlag: ProtoField(8, "int32"),
+		startTime: ProtoField(9, "int32"),
+		needCommFriend: ProtoField(12, "int32"),
+		field22: ProtoField(22, "int32")
+	});
+	_Oidb.FetchFriendRequestsResp = ProtoMessage.of({
+		field1: ProtoField(1, "int32"),
+		field2: ProtoField(2, "int32"),
+		info: ProtoField(3, {
+			field2: ProtoField(2, "int32"),
+			count: ProtoField(3, "int32"),
+			requests: ProtoField(7, {
+				selfUid: ProtoField(1, "string"),
+				friendUid: ProtoField(2, "string"),
+				state: ProtoField(3, "int32"),
+				timestamp: ProtoField(4, "uint32"),
+				comment: ProtoField(5, "string"),
+				source: ProtoField(6, "string"),
+				sourceId: ProtoField(7, "int32"),
+				subSourceId: ProtoField(8, "int32"),
+				isInitiator: ProtoField(20, "bool")
+			}, "repeated")
+		})
+	});
+	_Oidb.FetchFilteredFriendRequestsReq = ProtoMessage.of({
+		field1: ProtoField(1, "int32"),
+		field2: ProtoField(2, { count: ProtoField(1, "int32") })
+	});
+	_Oidb.FetchFilteredFriendRequestsResp = ProtoMessage.of({ info: ProtoField(2, { requests: ProtoField(1, {
+		sourceUid: ProtoField(1, "string"),
+		sourceNickname: ProtoField(2, "string"),
+		comment: ProtoField(5, "string"),
+		source: ProtoField(6, "string"),
+		warningInfo: ProtoField(7, "string"),
+		timestamp: ProtoField(8, "uint32"),
+		groupCode: ProtoField(9, "uint32")
+	}, "repeated") }) });
 })(Oidb || (Oidb = {}));
 //#endregion
 //#region src/ntqqapi/proto/msg.ts
@@ -24677,10 +24742,7 @@ var SetFriendAddRequest = class extends BaseAction {
 	});
 	async _handle(payload) {
 		await this.ctx.ntFriendApi.approvalFriendRequest(payload.flag, payload.approve);
-		if (payload.remark) {
-			const res = await this.ctx.ntFriendApi.setBuddyRemark(payload.flag, payload.remark);
-			if (res.result !== 0) throw new Error(res.errMsg);
-		}
+		if (payload.remark) await this.ctx.ntFriendApi.setFriendRemark(payload.flag, payload.remark);
 		return null;
 	}
 };
@@ -24969,17 +25031,17 @@ var DownloadFile = class extends BaseAction {
 		const isRandomName = !payload.name;
 		const name = payload.name ? path.basename(payload.name) : randomUUID();
 		const filePath = path.join(TEMP_DIR, name);
-		if (payload.base64) await fsPromise.writeFile(filePath, payload.base64, "base64");
+		if (payload.base64) await fsPromise$1.writeFile(filePath, payload.base64, "base64");
 		else if (payload.url) {
 			const headers = this.getHeaders(payload.headers);
 			const res = await fetchFile(payload.url, headers);
-			await fsPromise.writeFile(filePath, res.data);
+			await fsPromise$1.writeFile(filePath, res.data);
 		} else throw new Error("不存在任何文件, 无法下载");
-		if (fs$1.existsSync(filePath)) {
+		if (fs.existsSync(filePath)) {
 			if (isRandomName) {
 				const md5 = await getMd5HexFromFile(filePath);
 				const newPath = path.join(TEMP_DIR, md5);
-				await fsPromise.rename(filePath, newPath);
+				await fsPromise$1.rename(filePath, newPath);
 				return { file: newPath };
 			}
 			return { file: filePath };
@@ -25827,8 +25889,7 @@ var DeleteFriend$1 = class extends BaseAction {
 		const uin = payload.user_id.toString();
 		const uid = await this.ctx.ntUserApi.getUidByUin(uin);
 		if (!uid) throw new Error("无法获取用户信息");
-		const res = await this.ctx.ntFriendApi.delBuddy(uid);
-		if (res.result !== 0) throw new Error(res.errMsg);
+		await this.ctx.ntFriendApi.deleteFriend(uid);
 		return null;
 	}
 };
@@ -25966,8 +26027,7 @@ var SetFriendCategory = class extends BaseAction {
 	async _handle(payload) {
 		const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString());
 		if (!uid) throw new Error("无法获取好友信息");
-		const res = await this.ctx.ntFriendApi.setBuddyCategory(uid, +payload.category_id);
-		if (res.result !== 0) throw new Error(res.errMsg);
+		await this.ctx.ntFriendApi.setFriendCategory(uid, +payload.category_id);
 		return null;
 	}
 };
@@ -25982,8 +26042,7 @@ var SetFriendRemark = class extends BaseAction {
 	async _handle(payload) {
 		const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString());
 		if (!uid) throw new Error("无法获取好友信息");
-		const res = await this.ctx.ntFriendApi.setBuddyRemark(uid, payload.remark);
-		if (res.result !== 0) throw new Error(res.errMsg);
+		await this.ctx.ntFriendApi.setFriendRemark(uid, payload.remark);
 		return null;
 	}
 };
@@ -26502,17 +26561,17 @@ var GetDoubtFriendsAddRequest = class extends BaseAction {
 	actionName = ActionName.GetDoubtFriendsAddRequest;
 	payloadSchema = lib_default$1.object({ count: lib_default$1.union([Number, String]).default(50) });
 	async _handle(payload) {
-		const res = await this.ctx.ntFriendApi.getDoubtBuddyReq(+payload.count);
-		return await Promise.all(res.doubtList.map(async (e) => {
+		const res = await this.ctx.ntFriendApi.getDoubtFriendRequests(+payload.count);
+		return await Promise.all(res.map(async (e) => {
 			return {
-				flag: e.uid,
-				uin: await this.ctx.ntUserApi.getUinByUid(e.uid),
-				nick: e.nick,
+				flag: e.sourceUid,
+				uin: await this.ctx.ntUserApi.getUinByUid(e.sourceUid),
+				nick: e.sourceNickname,
 				source: e.source,
-				reason: e.reason,
-				msg: e.msg,
-				group_code: e.groupCode,
-				time: e.reqTime,
+				reason: e.warningInfo,
+				msg: e.comment,
+				group_code: e.groupCode.toString(),
+				time: e.timestamp.toString(),
 				type: "doubt"
 			};
 		}));
@@ -28909,8 +28968,7 @@ var handleFriendRequest = async (ctx, payload) => {
 var deleteFriend = async (ctx, payload) => {
 	const uid = await ctx.ntUserApi.getUidByUin(payload.user_id);
 	if (!uid) throw new Error("无法获取用户信息");
-	const res = await ctx.ntFriendApi.delBuddy(uid);
-	if (res.result !== 0) throw new Error(res.errMsg);
+	await ctx.ntFriendApi.deleteFriend(uid);
 	return {};
 };
 //#endregion
@@ -43473,7 +43531,7 @@ async function download(url, headers) {
 	return Buffer.from(bytes);
 }
 async function resolveMilkyUri(uri) {
-	if (uri.startsWith("file://")) return await fs.readFile(fileURLToPath(uri));
+	if (uri.startsWith("file://")) return await fsPromise.readFile(fileURLToPath(uri));
 	if (uri.startsWith("http://") || uri.startsWith("https://")) return await download(uri);
 	if (uri.startsWith("base64://")) return Buffer.from(uri.slice(9), "base64");
 	throw new Error(`Unsupported URI scheme: ${uri}`);
@@ -43581,7 +43639,7 @@ var SystemApi = [
 		return Ok({ member: transformGroupMember(await ctx.ntGroupApi.getGroupMember(groupCode, memberUid, payload.no_cache), payload.group_id) });
 	}),
 	defineApi("get_peer_pins", zod_default.object({}), GetPeerPinsOutput, async (ctx) => {
-		const result = await ctx.ntSystemApi.getPins();
+		const result = await ctx.ntMsgApi.getPins();
 		return Ok({
 			friends: await Promise.all(result.friends.map(async (e) => {
 				const info = await ctx.ntFriendApi.getFriendInfoByUid(e.uid, false);
@@ -48188,34 +48246,30 @@ var FriendApi = [
 	defineApi("delete_friend", DeleteFriendInput, zod_default.object({}), async (ctx, payload) => {
 		const uid = await ctx.ntUserApi.getUidByUin(payload.user_id.toString());
 		if (!uid) return Failed(-404, "User not found");
-		const result = await ctx.ntFriendApi.delBuddy(uid);
-		if (result.result !== 0) return Failed(-500, result.errMsg);
+		await ctx.ntFriendApi.deleteFriend(uid);
 		return Ok({});
 	}),
 	defineApi("get_friend_requests", GetFriendRequestsInput, GetFriendRequestsOutput, async (ctx, payload) => {
 		if (payload.is_filtered) {
-			const result = await ctx.ntFriendApi.getDoubtBuddyReq(payload.limit);
-			return Ok({ requests: await Promise.all(result.doubtList.map(async (e) => {
-				return {
-					time: Number(e.reqTime),
-					initiator_id: Number(await ctx.ntUserApi.getUinByUid(e.uid)),
-					initiator_uid: e.uid,
-					target_user_id: Number(selfInfo.uin),
-					target_user_uid: selfInfo.uid,
-					state: "pending",
-					comment: e.msg,
-					via: e.source,
-					is_filtered: true
-				};
-			})) });
+			const result = await ctx.ntFriendApi.getDoubtFriendRequests(payload.limit);
+			return Ok({ requests: await Promise.all(result.map(async (e) => ({
+				time: e.timestamp,
+				initiator_id: Number(await ctx.ntUserApi.getUinByUid(e.sourceUid)),
+				initiator_uid: e.sourceUid,
+				target_user_id: Number(selfInfo.uin),
+				target_user_uid: selfInfo.uid,
+				state: "pending",
+				comment: e.comment,
+				via: e.source,
+				is_filtered: true
+			}))) });
 		} else {
-			let buddyReqs = (await ctx.ntFriendApi.getBuddyReq()).buddyReqs;
-			if (buddyReqs.length > payload.limit) buddyReqs = buddyReqs.slice(0, payload.limit);
-			return Ok({ requests: await Promise.all(buddyReqs.map(async (e) => {
+			const result = await ctx.ntFriendApi.getFriendRequests(payload.limit);
+			return Ok({ requests: await Promise.all(result.map(async (e) => {
 				const friendId = Number(await ctx.ntUserApi.getUinByUid(e.friendUid));
 				const selfId = Number(selfInfo.uin);
 				return {
-					time: Number(e.reqTime),
+					time: e.timestamp,
 					initiator_id: e.isInitiator ? selfId : friendId,
 					initiator_uid: e.isInitiator ? selfInfo.uid : e.friendUid,
 					target_user_id: e.isInitiator ? friendId : selfId,
@@ -48223,14 +48277,16 @@ var FriendApi = [
 					state: {
 						[BuddyReqType.PeerInitiator]: "pending",
 						[BuddyReqType.MeInitiatorWaitPeerConfirm]: "pending",
-						[BuddyReqType.PeerAgreed]: "accepted",
 						[BuddyReqType.MeAgreed]: "accepted",
+						[BuddyReqType.MeAgreedAndAdded]: "accepted",
+						[BuddyReqType.PeerAgreed]: "accepted",
+						[BuddyReqType.PeerAgreedAndAdded]: "accepted",
 						[BuddyReqType.PeerRefused]: "rejected",
 						[BuddyReqType.MeRefused]: "rejected"
-					}[e.reqType] ?? "pending",
-					comment: e.extWords,
-					via: e.addSource ?? "",
-					is_filtered: e.isDoubt
+					}[e.state] ?? "pending",
+					comment: e.comment,
+					via: e.source,
+					is_filtered: false
 				};
 			})) });
 		}
@@ -53063,14 +53119,15 @@ var NTQQFriendApi = class extends Service {
 		super(ctx, "ntFriendApi");
 		this.ctx = ctx;
 	}
-	async approvalFriendRequest(friendUid, accept) {
-		await this.ctx.pmhq.setFriendRequest(friendUid, accept ? 3 : 5);
-	}
 	async getFriendList(forceUpdate) {
 		if (forceUpdate || this.friendsCache.length === 0) {
 			const res = await this.ctx.pmhq.fetchFriends();
 			this.friendsCache = res.friendList.map((friend) => {
 				const biz = friend.subBiz.get(1);
+				let statusId = biz.numData.get(27372);
+				if (statusId >= 268435456) statusId -= 268435456;
+				if (statusId > 14878464) statusId -= 14878464;
+				if (statusId === 0) statusId = 2;
 				return {
 					uid: friend.uid,
 					uin: friend.uin,
@@ -53083,7 +53140,8 @@ var NTQQFriendApi = class extends Service {
 					sex: biz.numData.get(20009),
 					birthdayYear: biz.data.get(20031)[0] << 8 | biz.data.get(20031)[1],
 					birthdayMonth: biz.data.get(20031)[2],
-					birthdayDay: biz.data.get(20031)[3]
+					birthdayDay: biz.data.get(20031)[3],
+					status: statusId * 10
 				};
 			});
 			this.categoriesCache.clear();
@@ -53133,42 +53191,32 @@ var NTQQFriendApi = class extends Service {
 		const { ark } = await this.ctx.pmhq.getFriendRecommendContactArk(uin);
 		return ark;
 	}
-	async setBuddyRemark(uid, remark = "") {
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/setBuddyRemark", [{
-			uid,
-			remark
-		}]);
+	async setFriendRemark(uid, remark = "") {
+		return await this.ctx.pmhq.setFriendRemark(uid, remark);
 	}
-	async delBuddy(friendUid) {
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/delBuddy", [{
-			friendUid,
-			tempBlock: false,
-			tempBothDel: true
-		}]);
+	async deleteFriend(targetUid, block = false, bothDelete = true) {
+		return await this.ctx.pmhq.deleteFriend(targetUid, block, bothDelete);
 	}
-	async setBuddyCategory(uid, categoryId) {
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/setBuddyCategory", [uid, categoryId]);
+	async setFriendCategory(uid, categoryId) {
+		return await this.ctx.pmhq.setFriendCategory(uid, categoryId);
 	}
 	async clearBuddyReqUnreadCnt() {
 		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/clearBuddyReqUnreadCnt", []);
 	}
-	async getDoubtBuddyReq(reqNum) {
-		const reqId = Date.now().toString();
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getDoubtBuddyReq", [
-			reqId,
-			reqNum,
-			""
-		], {
-			resultCmd: "nodeIKernelBuddyListener/onDoubtBuddyReqChange",
-			resultCb: (payload) => payload.reqId === reqId
-		});
+	async getFriendRequests(limit) {
+		const { info } = await this.ctx.pmhq.fetchFriendRequests(selfInfo.uid, limit);
+		return info.requests;
+	}
+	async getDoubtFriendRequests(limit) {
+		const { info } = await this.ctx.pmhq.fetchFilteredFriendRequests(limit);
+		return info.requests;
+	}
+	async approvalFriendRequest(friendUid, accept) {
+		await this.ctx.pmhq.setFriendRequest(friendUid, accept ? 3 : 5);
 	}
 	async approvalDoubtFriendRequest(requestUid) {
 		return await this.ctx.pmhq.setFilteredFriendRequestReq(selfInfo.uid, requestUid);
 	}
-	async getBuddyReq() {
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyReq", [], { resultCmd: "nodeIKernelBuddyListener/onBuddyReqChange" });
-	}
 	async getCategoryById(categoryId) {
 		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getCategoryById", [categoryId]);
 	}
@@ -53880,6 +53928,9 @@ var NTQQMsgApi = class extends Service {
 			toUid
 		]);
 	}
+	async getPins() {
+		return await this.ctx.pmhq.fetchPins();
+	}
 };
 //#endregion
 //#region src/common/utils/request.ts
@@ -54295,7 +54346,7 @@ var NTQQWebApi = class extends Service {
 		const iBatchID = Math.floor(Date.now() / 1e3);
 		for (let i = 0; i < filePathList.length; i++) {
 			const filePath = filePathList[i];
-			const fileBuffer = await fs.readFile(filePath);
+			const fileBuffer = await fsPromise.readFile(filePath);
 			const fileSize = fileBuffer.length;
 			const fileType = await fileTypeFromBuffer(fileBuffer);
 			const timestamp = Math.floor(Date.now() / 1e3);
@@ -54480,7 +54531,7 @@ var NTQQWebApi = class extends Service {
 			}
 			if (sVid) {
 				const filePath = await createThumb(this.ctx, filePathList[i]);
-				const fileBuffer = await fs.readFile(filePath);
+				const fileBuffer = await fsPromise.readFile(filePath);
 				const fileSize = fileBuffer.length;
 				const timestamp = Math.floor(Date.now() / 1e3);
 				const checksum = getMd5HexFromBuffer(fileBuffer);
@@ -54648,9 +54699,6 @@ var NTQQSystemApi = class extends Service {
 	async scanQRCode(path) {
 		return await this.ctx.pmhq.invoke("nodeIKernelNodeMiscService/scanQBar", [path]);
 	}
-	async getPins() {
-		return await this.ctx.pmhq.fetchPins();
-	}
 };
 //#endregion
 //#region node_modules/get-port/index.js
@@ -55975,7 +56023,7 @@ var Config = class extends Service {
 		this.logger.info("配置文件位于", this.configPath);
 		this.config = this.get();
 		if (this.configPath) {
-			fs$2.watchFile(this.configPath, {
+			fs$1.watchFile(this.configPath, {
 				persistent: true,
 				interval: 1e3
 			}, () => {
@@ -55993,7 +56041,7 @@ var Config = class extends Service {
 	}
 	getDefaultConfig() {
 		const _defaultConfig = { ...defaultConfig };
-		const defaultConfigFromFile = fs$2.readFileSync(this.defaultConfigPath, "utf-8");
+		const defaultConfigFromFile = fs$1.readFileSync(this.defaultConfigPath, "utf-8");
 		try {
 			const parsedDefaultConfig = import_dist.default.parse(defaultConfigFromFile);
 			Object.assign(_defaultConfig, parsedDefaultConfig);
@@ -56004,12 +56052,12 @@ var Config = class extends Service {
 	}
 	reloadConfig() {
 		if (!this.configPath) return this.getDefaultConfig();
-		if (!fs$2.existsSync(this.configPath)) {
+		if (!fs$1.existsSync(this.configPath)) {
 			this.config = this.getDefaultConfig();
 			this.set(this.config);
 			return this.config;
 		} else {
-			const data = fs$2.readFileSync(this.configPath, "utf-8");
+			const data = fs$1.readFileSync(this.configPath, "utf-8");
 			let jsonData = defaultConfig;
 			try {
 				jsonData = import_dist.default.parse(data);
@@ -56035,7 +56083,7 @@ var Config = class extends Service {
 	writeConfig(config) {
 		if (!this.configPath) return;
 		this.watch = false;
-		fs$2.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
+		fs$1.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
 		setTimeout(() => {
 			this.watch = true;
 		}, 1500);
@@ -56141,13 +56189,13 @@ var WebUITokenUtil = class {
 	}
 	getToken() {
 		if (!this.token) {
-			if (fs$2.existsSync(this.tokenPath)) this.token = fs$2.readFileSync(this.tokenPath, "utf-8").trim();
+			if (fs$1.existsSync(this.tokenPath)) this.token = fs$1.readFileSync(this.tokenPath, "utf-8").trim();
 		}
 		return this.token;
 	}
 	setToken(token) {
 		this.token = token.trim();
-		fs$2.writeFileSync(this.tokenPath, token, "utf-8");
+		fs$1.writeFileSync(this.tokenPath, token, "utf-8");
 	}
 };
 var webuiTokenUtil = new WebUITokenUtil(path.join(DATA_DIR, "webui_token.txt"));
@@ -57139,19 +57187,19 @@ function createNotificationRoutes(ctx) {
 	});
 	router.get("/notifications/friend", async (c) => {
 		try {
-			const buddyReqs = ((await ctx.ntFriendApi.getBuddyReq()).buddyReqs || []).filter((reqItem) => !reqItem.isInitiator);
+			const buddyReqs = (await ctx.ntFriendApi.getFriendRequests(50)).filter((reqItem) => !reqItem.isInitiator);
 			const enriched = await Promise.all(buddyReqs.map(async (reqItem) => {
-				const uin = reqItem.friendUid ? await ctx.ntUserApi.getUinByUid(reqItem.friendUid).catch(() => "") : "";
+				const uin = await ctx.ntUserApi.getUinByUid(reqItem.friendUid).catch(() => "");
+				const nick = await ctx.ntUserApi.getUserSimpleInfo(reqItem.friendUid).then((e) => e.coreInfo.nick).catch(() => "");
 				return {
 					friendUid: reqItem.friendUid,
 					friendUin: uin,
-					friendNick: reqItem.friendNick,
-					friendAvatarUrl: reqItem.friendAvatarUrl,
-					reqTime: reqItem.reqTime,
-					extWords: reqItem.extWords,
-					isDecide: reqItem.isDecide,
-					reqType: reqItem.reqType,
-					addSource: reqItem.addSource || "",
+					friendNick: nick,
+					reqTime: reqItem.timestamp.toString(),
+					extWords: reqItem.comment,
+					isDecide: ![BuddyReqType.PeerInitiator, BuddyReqType.MeInitiatorWaitPeerConfirm].includes(reqItem.state),
+					reqType: reqItem.state,
+					addSource: reqItem.source,
 					flag: reqItem.friendUid
 				};
 			}));
@@ -57170,18 +57218,15 @@ function createNotificationRoutes(ctx) {
 	});
 	router.get("/notifications/friend/doubt", async (c) => {
 		try {
-			const enriched = ((await ctx.ntFriendApi.getDoubtBuddyReq(50)).doubtList || []).map((item) => ({
-				uid: item.uid,
-				nick: item.nick,
-				age: item.age,
-				sex: item.sex,
-				reqTime: item.reqTime,
-				msg: item.msg,
+			const enriched = (await ctx.ntFriendApi.getDoubtFriendRequests(50)).map((item) => ({
+				uid: item.sourceUid,
+				nick: item.sourceNickname,
+				reqTime: item.timestamp.toString(),
+				msg: item.comment,
 				source: item.source,
-				reason: item.reason,
+				reason: item.warningInfo,
 				groupCode: item.groupCode,
-				commFriendNum: item.commFriendNum,
-				flag: `doubt|${item.uid}|${item.reqTime}`
+				flag: item.sourceUid
 			}));
 			return c.json({
 				success: true,
@@ -57821,7 +57866,6 @@ var WebuiServer = class extends Service {
 						friendUid: req.friendUid,
 						friendUin: uin,
 						friendNick: req.friendNick,
-						friendAvatarUrl: req.friendAvatarUrl,
 						reqTime: req.reqTime,
 						extWords: req.extWords,
 						isDecide: req.isDecide,
@@ -58452,7 +58496,7 @@ var require_fetch = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_shared = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var urllib$2 = __require("url");
 	var util$1 = __require("util");
-	var fs$5 = __require("fs");
+	var fs$4 = __require("fs");
 	var nmfetch = require_fetch();
 	var dns$1 = __require("dns");
 	var net$4 = __require("net");
@@ -58788,7 +58832,7 @@ var require_shared = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				const parsedDataUri = module.exports.parseDataURI(content.path || content.href);
 				if (!parsedDataUri || !parsedDataUri.data) return callback(null, Buffer.from(0));
 				return callback(null, parsedDataUri.data);
-			} else if (content.path) return resolveStream(fs$5.createReadStream(content.path), callback);
+			} else if (content.path) return resolveStream(fs$4.createReadStream(content.path), callback);
 		}
 		if (typeof data[key].content === "string" && ![
 			"utf8",
@@ -62728,7 +62772,7 @@ var require_le_unix = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region node_modules/nodemailer/lib/mime-node/index.js
 var require_mime_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var crypto$8 = __require("crypto");
-	var fs$4 = __require("fs");
+	var fs$3 = __require("fs");
 	var punycode = require_punycode();
 	var { PassThrough: PassThrough$2 } = __require("stream");
 	var shared = require_shared();
@@ -63437,7 +63481,7 @@ var require_mime_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					});
 					return contentStream;
 				}
-				return fs$4.createReadStream(content.path);
+				return fs$3.createReadStream(content.path);
 			}
 			if (content && typeof content.href === "string") {
 				if (this.disableUrlAccess) {
@@ -64276,7 +64320,7 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var RelaxedBody = require_relaxed_body();
 	var sign = require_sign();
 	var { PassThrough: PassThrough$1 } = __require("stream");
-	var fs$3 = __require("fs");
+	var fs$2 = __require("fs");
 	var path$2 = __require("path");
 	var crypto$5 = __require("crypto");
 	var DKIM_ALGO = "sha256";
@@ -64309,10 +64353,10 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		cleanup() {
 			if (!this.cache || !this.cachePath) return;
-			fs$3.unlink(this.cachePath, () => false);
+			fs$2.unlink(this.cachePath, () => false);
 		}
 		createReadCache() {
-			this.cache = fs$3.createReadStream(this.cachePath);
+			this.cache = fs$2.createReadStream(this.cachePath);
 			this.cache.once("error", (err) => {
 				this.cleanup();
 				this.output.emit("error", err);
@@ -64358,7 +64402,7 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		createWriteCache() {
 			this.output.usingCache = true;
-			this.cache = fs$3.createWriteStream(this.cachePath);
+			this.cache = fs$2.createWriteStream(this.cachePath);
 			this.cache.once("error", (err) => {
 				this.cleanup();
 				this.relaxedBody.unpipe(this.cache);
@@ -69676,6 +69720,7 @@ function FriendMixin(Base) {
 						20009,
 						20031,
 						20037,
+						27372,
 						27394
 					] }
 				}]
@@ -69704,6 +69749,87 @@ function FriendMixin(Base) {
 			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
 			return Oidb.GetFriendRecommendContactArkResp.decode(oidbRespBody);
 		}
+		async setFriendRemark(uid, remark) {
+			const body = Oidb.SetFriendRemarkReq.encode({
+				uid,
+				remark
+			});
+			const data = Oidb.Base.encode({
+				command: 4300,
+				subCommand: 1,
+				body
+			});
+			await this.httpSendPB("OidbSvcTrpcTcp.0x10cc_1", data);
+		}
+		async deleteFriend(targetUid, block, bothDelete) {
+			const body = Oidb.DeleteFriendReq.encode({ field1: {
+				targetUid,
+				field2: {
+					field1: 130,
+					field2: 109,
+					field3: {
+						field1: 8,
+						field2: 8,
+						field3: 50
+					}
+				},
+				block,
+				bothDelete
+			} });
+			const data = Oidb.Base.encode({
+				command: 4715,
+				subCommand: 0,
+				body
+			});
+			await this.httpSendPB("OidbSvcTrpcTcp.0x126b_0", data);
+		}
+		async setFriendCategory(uid, categoryId) {
+			const body = Oidb.SetFriendCategoryReq.encode({
+				uid,
+				categoryId
+			});
+			const data = Oidb.Base.encode({
+				command: 4331,
+				subCommand: 1,
+				body
+			});
+			await this.httpSendPB("OidbSvcTrpcTcp.0x10eb_1", data);
+		}
+		async fetchFriendRequests(selfUid, reqNum) {
+			const body = Oidb.FetchFriendRequestsReq.encode({
+				version: 1,
+				type: 6,
+				selfUid,
+				startIndex: 0,
+				reqNum,
+				getFlag: 2,
+				startTime: 0,
+				needCommFriend: 1,
+				field22: 1
+			});
+			const data = Oidb.Base.encode({
+				command: 1487,
+				subCommand: 11,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x5cf_11", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			return Oidb.FetchFriendRequestsResp.decode(oidbRespBody);
+		}
+		async fetchFilteredFriendRequests(count) {
+			const body = Oidb.FetchFilteredFriendRequestsReq.encode({
+				field1: 1,
+				field2: { count }
+			});
+			const data = Oidb.Base.encode({
+				command: 3433,
+				subCommand: 0,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0xd69_0", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			return Oidb.FetchFilteredFriendRequestsResp.decode(oidbRespBody);
+		}
 	};
 }
 //#endregion