@alemonjs/qq-bot 2.1.38 → 2.1.40

package/README.md

@@ -13,6 +13,8 @@ AlemonJS 的 QQ 开放平台适配器，用于连接官方机器人接口，将
 
 三层限流、QQ 文本清洗、引用索引、群历史、LLM 上下文和 C2C 自动 typing 的配置与用法见 [消息处理与会话上下文](../alemonjs/docs/message-context.md)。
 
+Markdown 图片支持使用 `Media.image(source)` 自动准备 QQ 素材，也可通过媒体 Hook 提前上传、查询与删除，见[图片来源与平台资源](../alemonjs/docs/media.md)。
+
 ## 配置
 
 ### 基础配置

package/lib/format.d.ts

@@ -1,7 +1,8 @@
 import { DataEnums, DataMarkDown } from "alemonjs";
 //#region src/format.d.ts
+type QQMarkdownContext = 'group' | 'c2c' | 'guild';
 /** 群聊、私聊和频道共用有序正文；提及等原生文本由发送上下文提供。 */
-declare const formatQQContent: (items: DataEnums[], renderNative: (item: DataEnums) => string, plain?: boolean, hideUnsupported?: boolean | number) => string;
+declare const formatQQContent: (items: DataEnums[], renderNative: (item: DataEnums) => string, plain?: boolean, hideUnsupported?: boolean | number, context?: QQMarkdownContext) => string;
 /**
  * 将结构化 Markdown 子元素数组转为可读纯文本
  */
@@ -24,6 +25,6 @@ declare const markdownRawToText: (raw: string, hideUnsupported?: boolean | numbe
  * 其余类型降级为文本
  */
 declare const dataEnumToText: (item: DataEnums, hideUnsupported?: boolean | number) => string;
-declare const createMarkdownText: (data: DataMarkDown['value']) => string;
+declare const createMarkdownText: (data: DataMarkDown['value'], context?: QQMarkdownContext) => string;
 //#endregion
-export { buttonsToText, createMarkdownText, dataEnumToText, formatQQContent, markdownRawToText, markdownToText };
+export { QQMarkdownContext, buttonsToText, createMarkdownText, dataEnumToText, formatQQContent, markdownRawToText, markdownToText };

package/lib/format.js

@@ -2,9 +2,9 @@ import { joinMarkdownParts, renderMarkdownBlockquote } from "alemonjs/markdown";
 
 //#region src/format.ts
 /** 群聊、私聊和频道共用有序正文；提及等原生文本由发送上下文提供。 */
-const formatQQContent = (items, renderNative, plain = false, hideUnsupported) => {
+const formatQQContent = (items, renderNative, plain = false, hideUnsupported, context = "group") => {
 	return items.map((item) => {
-		if (item.type === "Markdown") return plain ? markdownToText(item.value, hideUnsupported) : createMarkdownText(item.value);
+		if (item.type === "Markdown") return plain ? markdownToText(item.value, hideUnsupported) : createMarkdownText(item.value, context);
 		if (item.type === "MarkdownOriginal") {
 			const text = plain ? markdownRawToText(item.value, hideUnsupported) : item.value;
 			return text ? `\n\n${text}\n\n` : "";
@@ -111,6 +111,7 @@ const dataEnumToText = (item, hideUnsupported) => {
 		default: return "";
 	}
 };
+const escapeAttribute = (value) => value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 const mdFormatters = {
 	"MD.title": (value) => `# ${value} `,
 	"MD.subtitle": (value) => `## ${value} `,
@@ -120,7 +121,7 @@ const mdFormatters = {
 	"MD.italic": (value) => `__${value}__ `,
 	"MD.italicStar": (value) => `*${value}* `,
 	"MD.strikethrough": (value) => `~~${value}~~ `,
-	"MD.blockquote": (value) => renderMarkdownBlockquote(value, createMarkdownText),
+	"MD.blockquote": (value, _options, context) => renderMarkdownBlockquote(value, (children) => createMarkdownText(children, context)),
 	"MD.newline": () => "\n",
 	"MD.link": (value) => {
 		if (!value?.text && !value?.url) return "";
@@ -136,15 +137,17 @@ const mdFormatters = {
 		return `<qqbot-at-user id="${value}" />`;
 	},
 	"MD.content": (value) => `${value}`,
-	"MD.button": (title, options) => {
+	"MD.button": (title, options, context) => {
 		const { data, autoEnter } = options || {};
-		if (autoEnter) return `<qqbot-cmd-enter text="${data}" show="${title}" />`;
-		return `<qqbot-cmd-input text="${data}" show="${title}" />`;
+		const text = String(data ?? title ?? "");
+		if (autoEnter && context === "c2c") return `<qqbot-cmd-enter text="${escapeAttribute(text)}" />`;
+		const inputText = text.slice(0, 80).replace(/[\uD800-\uDBFF]$/u, "");
+		return `<qqbot-cmd-input text="${escapeAttribute(inputText)}" show="${escapeAttribute(String(title ?? ""))}" />`;
 	}
 };
-const createMarkdownText = (data) => {
+const createMarkdownText = (data, context = "group") => {
 	return joinMarkdownParts(data, data.map((mdItem) => {
-		if (mdFormatters[mdItem.type]) return mdFormatters[mdItem.type](mdItem?.value, mdItem?.options);
+		if (mdFormatters[mdItem.type]) return mdFormatters[mdItem.type](mdItem?.value, mdItem?.options, context);
 		if (mdItem.type === "MD.list" && typeof mdItem.value !== "string") return `${mdItem.value.map((listItem) => {
 			return typeof listItem.value === "object" ? `\n${listItem.value.index}. ${listItem.value.text}` : `\n- ${listItem.value}`;
 		}).join("")}\n`;

package/lib/materials.d.ts

@@ -0,0 +1,15 @@
+import { QQBotAPI } from "./sdk/api.js";
+import { MediaResource, MediaResourcePage, MediaSourceInput } from "alemonjs";
+//#region src/materials.d.ts
+/** Bot-scoped Markdown image materials. No access token is forwarded to COS. */
+declare class QQImageMaterials {
+  #private;
+  private readonly client;
+  private readonly botId;
+  constructor(client: QQBotAPI, botId: string);
+  upload(source: MediaSourceInput): Promise<MediaResource>;
+  list(cursor?: string): Promise<MediaResourcePage>;
+  delete(resource: MediaResource): Promise<{}>;
+}
+//#endregion
+export { QQImageMaterials };

package/lib/materials.js

@@ -0,0 +1,170 @@
+import axios from "axios";
+import { createHash } from "node:crypto";
+import { basename, extname } from "node:path";
+import { readFile, stat } from "node:fs/promises";
+import { fileTypeFromBuffer } from "file-type";
+
+//#region src/materials.ts
+const LIMIT = 10485760;
+const supported = {
+	"image/png": [".png"],
+	"image/jpeg": [".jpg", ".jpeg"],
+	"image/gif": [".gif"],
+	"image/webp": [".webp"]
+};
+/** Bot-scoped Markdown image materials. No access token is forwarded to COS. */
+var QQImageMaterials = class {
+	client;
+	botId;
+	#cache = /* @__PURE__ */ new Map();
+	#pending = /* @__PURE__ */ new Map();
+	constructor(client, botId) {
+		this.client = client;
+		this.botId = botId;
+	}
+	#resource(raw) {
+		if (typeof raw?.image_id !== "string" || typeof raw.url !== "string" || !raw.url.startsWith("qqbot-media://image/v1/")) throw new Error("QQ returned an invalid Markdown image resource");
+		return {
+			kind: "media-resource",
+			type: "image",
+			id: raw.image_id,
+			owner: {
+				platform: "qq-bot",
+				botId: this.botId
+			},
+			usage: "markdown",
+			reference: raw.url,
+			name: raw.file_name,
+			expiration: {
+				mode: "sliding",
+				...Number.isSafeInteger(raw.ttl) && raw.ttl > 0 && { windowSeconds: raw.ttl },
+				...Number.isFinite(raw.expires_at) && { expiresAt: raw.expires_at * 1e3 }
+			}
+		};
+	}
+	async upload(source) {
+		const values = [
+			source?.url,
+			source?.data,
+			source?.filePath
+		].filter((value) => value !== void 0);
+		if (values.length !== 1 || values.some((value) => typeof value !== "string" || !value)) throw new Error("Provide exactly one image source");
+		let bytes;
+		let name = source.name;
+		if (source.filePath) {
+			const info = await stat(source.filePath);
+			if (!info.isFile() || info.size > LIMIT) throw new Error("Markdown image must be a regular file no larger than 10 MiB");
+			bytes = await readFile(source.filePath);
+			name ??= basename(source.filePath);
+		} else if (source.url) {
+			const url = new URL(source.url);
+			if (!["http:", "https:"].includes(url.protocol)) throw new Error("Image URL must use HTTP or HTTPS");
+			const response = await axios.get(source.url, {
+				responseType: "arraybuffer",
+				timeout: 2e4,
+				maxContentLength: LIMIT,
+				headers: {
+					Authorization: null,
+					Cookie: null
+				}
+			});
+			bytes = Buffer.from(response.data);
+			name ??= basename(url.pathname) || void 0;
+		} else {
+			const data = source.data.replace(/^base64:\/\//, "");
+			if (data.length > Math.ceil(LIMIT / 3) * 4 || !/^[a-z\d+/]*={0,2}$/i.test(data) || data.length % 4 !== 0) throw new Error("Invalid or oversized base64 image");
+			bytes = Buffer.from(data, "base64");
+		}
+		if (!bytes.length || bytes.length > LIMIT) throw new Error("Markdown image must contain at most 10 MiB of image data");
+		const detected = await fileTypeFromBuffer(bytes);
+		if (!detected || !supported[detected.mime]) throw new Error("QQ Markdown materials support PNG, JPEG, GIF and WebP images");
+		if (!name || !source.name && !extname(name)) name = `${name || "image"}.${detected.ext}`;
+		if (!supported[detected.mime].includes(extname(name).toLowerCase())) throw new Error("Image filename extension must match its actual MIME type");
+		const key = `${createHash("sha256").update(bytes).digest("hex")}:${name}:${detected.mime}`;
+		const cached = this.#cache.get(key);
+		if (cached && cached.until > Date.now()) return structuredClone(cached.resource);
+		const pending = this.#pending.get(key);
+		if (pending !== void 0) return structuredClone(await pending);
+		if (this.#pending.size >= 100) throw new Error("Too many concurrent material uploads");
+		const task = this.#upload(bytes, name, detected.mime).then((resource) => {
+			if (this.#cache.size >= 100) this.#cache.delete(this.#cache.keys().next().value);
+			const lifetime = resource.expiration?.windowSeconds ?? 0;
+			if (lifetime > 0) this.#cache.set(key, {
+				resource,
+				until: Date.now() + lifetime * 1e3
+			});
+			return resource;
+		});
+		this.#pending.set(key, task);
+		try {
+			return structuredClone(await task);
+		} finally {
+			this.#pending.delete(key);
+		}
+	}
+	async #upload(bytes, name, mime) {
+		const prepared = await this.client.groupService({
+			method: "POST",
+			url: "/v2/media-images/prepare",
+			data: {
+				file_name: name,
+				file_size: bytes.length,
+				content_type: mime,
+				md5: createHash("md5").update(bytes).digest("hex"),
+				sha1: createHash("sha1").update(bytes).digest("hex")
+			}
+		});
+		const uploadUrl = new URL(prepared.presigned_url);
+		if (!["http:", "https:"].includes(uploadUrl.protocol) || !prepared.upload_id) throw new Error("QQ returned an invalid material upload task");
+		const uploaded = await axios.put(prepared.presigned_url, bytes, {
+			timeout: 2e4,
+			maxBodyLength: LIMIT,
+			maxRedirects: 0,
+			headers: {
+				"Content-Type": mime,
+				Authorization: null,
+				Cookie: null
+			}
+		}).catch(() => {
+			throw new Error("Markdown image binary upload failed");
+		});
+		const md5 = String(uploaded.headers.etag ?? "").replace(/^"|"$/g, "").toLowerCase();
+		if (md5 !== createHash("md5").update(bytes).digest("hex")) throw new Error("Markdown image upload returned an invalid ETag");
+		const completed = await this.client.groupService({
+			method: "POST",
+			url: "/v2/media-images/complete",
+			data: {
+				upload_id: prepared.upload_id,
+				md5
+			}
+		});
+		return {
+			...this.#resource(completed),
+			name
+		};
+	}
+	async list(cursor) {
+		const raw = await this.client.groupService({
+			method: "GET",
+			url: "/v2/media-images",
+			params: { cursor }
+		});
+		return {
+			Items: raw.images.map((item) => this.#resource(item)),
+			NextCursor: raw.next_cursor || void 0,
+			Total: raw.total
+		};
+	}
+	async delete(resource) {
+		if (resource.owner?.platform !== "qq-bot" || resource.owner.botId !== this.botId || resource.usage !== "markdown" || !resource.id) throw new Error("Image resource does not belong to this bot and usage");
+		await this.client.groupService({
+			method: "DELETE",
+			url: `/v2/media-images/${encodeURIComponent(resource.id)}/delete`
+		});
+		for (const [key, entry] of this.#cache) if (entry.resource.id === resource.id) this.#cache.delete(key);
+		return {};
+	}
+};
+
+//#endregion
+export { QQImageMaterials };

package/lib/register.js

@@ -1,4 +1,5 @@
 import { getIdentity, getMaster, getQQBotConfig, platform } from "./config.js";
+import { QQImageMaterials } from "./materials.js";
 import { sanitizeQQText } from "./text-sanitizer.js";
 import { AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, MESSAGE_CREATE } from "./sends.js";
 import { normalizeFrameworkEvent, normalizeMessageUser } from "./framework-events.js";
@@ -973,6 +974,11 @@ const register = (client, options) => {
 			}
 		}
 	};
+	const materials = new QQImageMaterials(client, botId);
+	const assertResource = (resource, usage, target) => {
+		if (resource.kind !== "media-resource" || resource.type !== "image" || resource.owner?.platform !== "qq-bot" || resource.owner.botId !== botId || resource.usage !== usage || !resource.id || !resource.reference) throw new Error("Image resource does not belong to this bot or usage");
+		if (resource.target && (!target || resource.target.scope !== target.scope || resource.target.targetId !== target.targetId)) throw new Error("Image resource belongs to another conversation");
+	};
 	const onactions = async (data, consume) => {
 		const event = data.payload.event ?? {};
 		const requestedBot = data.payload.params?.target?.BotId ?? data.payload.target?.BotId ?? data.payload.BotId ?? event.BotId;
@@ -1003,6 +1009,88 @@ const register = (client, options) => {
 					return;
 				}
 			}
+			if (data.action.startsWith("media.resource.")) {
+				const params = data.payload.params ?? {};
+				const target = normalizeTarget(params.target ?? data.payload.target);
+				let result;
+				if (data.action === "media.resource.capabilities") result = { usages: {
+					message: {
+						upload: true,
+						list: false,
+						delete: false
+					},
+					markdown: {
+						upload: true,
+						list: true,
+						delete: true,
+						maxBytes: 10485760,
+						maxItems: 100
+					}
+				} };
+				else if (data.action === "media.resource.list") {
+					if (params.usage !== "markdown") throw new Error("QQ resource listing is only available for Markdown images");
+					result = await materials.list(params.cursor);
+				} else if (data.action === "media.resource.delete") {
+					assertResource(params.resource, "markdown");
+					result = await materials.delete(params.resource);
+				} else if (data.action === "media.resource.upload" || data.action === "media.resource.resolve") {
+					if (!["message", "markdown"].includes(params.usage)) throw new Error("Invalid image resource usage");
+					if (data.action === "media.resource.resolve" && params.usage === "markdown" && config.markdownToText) throw new Error("Markdown images cannot be embedded when markdownToText is enabled");
+					const image = params.image;
+					if (image?.kind === "media-resource") {
+						assertResource(image, params.usage, target);
+						result = image;
+					} else {
+						if (image && (image.kind !== "media-source" || image.type !== "image")) throw new Error("Expected an image source");
+						if (!image && params.type !== "image") throw new Error("Expected image upload type");
+						const source = image ? image.source : params.source;
+						if (params.usage === "markdown") result = await materials.upload(source);
+						else {
+							if (!target) throw new Error("A target is required for message image resources");
+							const uploaded = await uploadMedia(target, {
+								...source,
+								type: "image",
+								send: false
+							});
+							result = {
+								kind: "media-resource",
+								type: "image",
+								id: uploaded.fileId,
+								reference: uploaded.fileId,
+								owner: {
+									platform,
+									botId
+								},
+								usage: "message",
+								target: {
+									...target,
+									BotId: botId
+								},
+								name: source.name,
+								expiration: {
+									mode: "fixed",
+									expiresAt: "expiresAt" in uploaded ? uploaded.expiresAt : void 0
+								}
+							};
+						}
+					}
+				} else throw new Error("Unsupported media resource operation");
+				consume([createResult(ResultCode.Ok, data.action, result)]);
+				return;
+			}
+			if (data.action === "message.send" && data.payload.params?.format) {
+				const target = normalizeTarget(data.payload.target);
+				const validate = (items) => {
+					for (const item of items) {
+						if (item.media) {
+							if (item.type !== "Image") throw new Error("Structured media must be prepared through useMessage before sending");
+							assertResource(item.media, "message", target);
+						}
+						if ((item.type === "Markdown" || item.type === "MD.blockquote") && Array.isArray(item.value)) validate(item.value);
+					}
+				};
+				validate(data.payload.params.format);
+			}
 			const handled = await handleFrameworkAction(client, data, botId);
 			if (handled) {
 				consume(handled);

package/lib/sends.js

@@ -177,13 +177,13 @@ const formatMention = (item, mode) => {
 	const value = item.value;
 	const isEmptyMention = value === "everyone" || value === "all" || value === "" || typeof value !== "string";
 	if (mode === "guild-public") {
-		if (isEmptyMention) return "@everyone";
-		if (item.options?.belong === "user") return `<@!${value}>`;
+		if (isEmptyMention) return "<qqbot-at-everyone />";
+		if (item.options?.belong === "user") return `<qqbot-at-user id="${value}" />`;
 		if (item.options?.belong === "channel") return `<#${value}>`;
 		return "";
 	}
 	if (isEmptyMention) return "";
-	if (item.options?.belong === "user") return `<@${value}>`;
+	if (item.options?.belong === "user") return `<qqbot-at-user id="${value}" />`;
 	return "";
 };
 /** 从消息数据中提取文本内容 */
@@ -231,7 +231,7 @@ const buildBaseParams = (tag, messageId, interactionTag) => {
 	return { msg_id: messageId };
 };
 /** 构建 Markdown 和按钮参数 */
-const buildMdAndButtonsParams = (val) => {
+const buildMdAndButtonsParams = (val, context = "group") => {
 	const items = val.filter((item) => item.type === "Markdown" || item.type === "MarkdownOriginal" || item.type === "BT.group" || item.type === "ButtonTemplate");
 	if (items.length === 0) return null;
 	const params = {};
@@ -255,7 +255,7 @@ const buildMdAndButtonsParams = (val) => {
 			}
 		} else params["keyboard"] = { content: createButtonsData(item.value) };
 	} else if (item.type === "Markdown" && typeof item?.value !== "string") {
-		const content = createMarkdownText(item.value);
+		const content = createMarkdownText(item.value, context);
 		if (content) {
 			if (params["markdown"]?.content) params["markdown"].content += content;
 			else params["markdown"] = { content };
@@ -321,6 +321,7 @@ const resolveFileData = async (item) => {
 */
 const resolveMediaUrl = async (media, uploadMedia) => {
 	for (const item of media) {
+		if (item.type === "Image" && item.media?.kind === "media-resource") return item.media.reference;
 		const fileData = await resolveFileData(item);
 		if (fileData) {
 			const fileInfo = await uploadMedia({
@@ -334,7 +335,7 @@ const resolveMediaUrl = async (media, uploadMedia) => {
 /** 移除富媒体占位符（dataEnumToText 降级产生的 [视频]/[音频]/[附件]） */
 const stripMediaPlaceholders = (text) => text.replace(/\[附件[^\]]*\]/g, "").replace(/\[音频\]/g, "").replace(/\[视频\]/g, "").trim();
 /** Open API 通用发送逻辑（群组 / C2C） */
-const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label, options) => {
+const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label, context, options) => {
 	if (options?.wakeup && (options.replyId || options.eventId) || options?.replyId && options?.eventId) return [createResult(ResultCode.FailParams, "wakeup, replyId and eventId are mutually exclusive", null)];
 	if (options?.wakeup || options?.replyId || options?.eventId) {
 		baseParams = {};
@@ -362,7 +363,7 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
 		})];
 	}
-	if (config.hideUnsupported === true && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
+	if (config.hideUnsupported === true && !content && !buildMdAndButtonsParams(val, context) && !buildArkParams(val)) {
 		logger.info("[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送");
 		return [];
 	}
@@ -382,9 +383,9 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 		}
 		return [];
 	}
-	const mdParams = buildMdAndButtonsParams(val);
+	const mdParams = buildMdAndButtonsParams(val, context);
 	if (mdParams) {
-		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], "group"));
+		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], "group"), false, void 0, context);
 		if (mdParams.markdown && options?.forceVerifyImageResource !== void 0) mdParams.markdown.force_verify_image_resource = options.forceVerifyImageResource;
 		const res = await sendMessage({
 			msg_type: 2,
@@ -453,7 +454,7 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label, mo
 		}, imageBuffer);
 		return [createResult(ResultCode.Ok, label, { id: res?.id })];
 	}
-	if (config.hideUnsupported && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
+	if (config.hideUnsupported && !content && !buildMdAndButtonsParams(val, "guild") && !buildArkParams(val)) {
 		logger.info("[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送");
 		return [];
 	}
@@ -468,9 +469,9 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label, mo
 		}
 		return [];
 	}
-	const mdParams = buildMdAndButtonsParams(val);
+	const mdParams = buildMdAndButtonsParams(val, "guild");
 	if (mdParams) {
-		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], mode));
+		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], mode), false, void 0, "guild");
 		const res = await sendMessage({
 			content: "",
 			...mdParams,
@@ -511,7 +512,7 @@ const GROUP_AT_MESSAGE_CREATE = async (client, event, val, options) => {
 	const baseParams = buildBaseParams(event._tag, event.MessageId, "INTERACTION_CREATE_GROUP");
 	const content = extractContent(val, "group");
 	try {
-		return await sendOpenApiMessage(content, val, baseParams, (data) => client.postRichMediaByGroup(event.ChannelId, data), (data) => client.groupOpenMessages(event.ChannelId, data), "client.groupOpenMessages", options);
+		return await sendOpenApiMessage(content, val, baseParams, (data) => client.postRichMediaByGroup(event.ChannelId, data), (data) => client.groupOpenMessages(event.ChannelId, data), "client.groupOpenMessages", "group", options);
 	} catch (err) {
 		return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
 	}
@@ -523,7 +524,7 @@ const C2C_MESSAGE_CREATE = async (client, event, val, options) => {
 	const baseParams = buildBaseParams(event._tag, event.MessageId, "INTERACTION_CREATE_C2C");
 	const content = extractContent(val, "group");
 	try {
-		return await sendOpenApiMessage(content, val, baseParams, (data) => client.postRichMediaByUser(event.UserId, data), (data) => client.usersOpenMessages(event.UserId, data), "client.usersOpenMessages", options);
+		return await sendOpenApiMessage(content, val, baseParams, (data) => client.postRichMediaByUser(event.UserId, data), (data) => client.usersOpenMessages(event.UserId, data), "client.usersOpenMessages", "c2c", options);
 	} catch (err) {
 		return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.38",
+  "version": "2.1.40",
   "description": "QQ官方平台",
   "author": "lemonade",
   "license": "MIT",
@@ -12,10 +12,13 @@
     "test:send": "yarn build && node tests/use-send.notice.mjs",
     "test:channel": "yarn --cwd ../alemonjs build && yarn build && node tests/channel.contract.mjs",
     "test:qr": "yarn build && node tests/qr-auth.mjs",
-    "test:non-channel": "yarn build && node tests/non-channel.contract.mjs && node tests/framework.contract.mjs && node tests/non-channel.transport.mjs && node tests/media-upload.contract.mjs && node tests/routing.contract.mjs && node tests/lifecycle.contract.mjs && node tests/http-diagnostics.contract.mjs && node tests/webhook-ingress.contract.mjs && node tests/text-sanitizer.contract.mjs && tsc -p tests/tsconfig.non-channel.json",
+    "test:non-channel": "yarn build && node tests/markdown-buttons.contract.mjs && node tests/non-channel.contract.mjs && node tests/framework.contract.mjs && node tests/non-channel.transport.mjs && node tests/media-upload.contract.mjs && node tests/routing.contract.mjs && node tests/lifecycle.contract.mjs && node tests/http-diagnostics.contract.mjs && node tests/webhook-ingress.contract.mjs && node tests/text-sanitizer.contract.mjs && tsc -p tests/tsconfig.non-channel.json",
     "docs:snapshot": "python3 scripts/snapshot-official.py",
     "test:http": "yarn build && node tests/http-diagnostics.contract.mjs && node tests/webhook-ingress.contract.mjs",
-    "test:text": "yarn build && node tests/text-sanitizer.contract.mjs"
+    "test:text": "yarn build && node tests/text-sanitizer.contract.mjs",
+    "test:materials": "yarn build && node tests/materials.contract.mjs",
+    "test:mention": "yarn build && node tests/everyone.contract.mjs",
+    "test:buttons": "yarn build && node tests/markdown-buttons.contract.mjs"
   },
   "dependencies": {
     "@noble/curves": "^1.7.0",
@@ -99,5 +102,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "e736f4e180a8694f8c9eb1796a23fdfadcc48f3e"
+  "gitHead": "c6aa5616afe091a37610dad22fbb2d2618d943b8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013-present, Yuxi (Evan) You
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIdED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.