@alemonjs/qq-bot 2.1.39 → 2.1.40

package/lib/config.d.ts

@@ -44,7 +44,7 @@ declare const getQQBotBots: () => {
   bots: Map<string, Options$1>;
   defaultBot?: string;
 };
-declare const getIdentity: (UserId: string) => readonly [any, any];
-declare const getMaster: (UserId: string) => readonly [any, any];
+declare const getIdentity: (UserId: string) => readonly [boolean, string];
+declare const getMaster: (UserId: string) => readonly [boolean, string];
 //#endregion
 export { Options, getIdentity, getMaster, getQQBotBots, getQQBotConfig, platform, platformFullName };

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/framework-actions.d.ts

@@ -3,25 +3,66 @@ import { OutgoingMessage } from "alemonjs";
 //#region src/framework-actions.d.ts
 declare const toQQMessage: (content: OutgoingMessage) => {
   msg_type: 0 | 2 | 3 | 7;
-  content: any;
+  content: string;
   markdown: {
-    content: any;
-    custom_template_id: any;
-    template_id: any;
-    params: any;
-    force_verify_image_resource: any;
+    content: string;
+    custom_template_id: string;
+    template_id: number;
+    params: {
+      key: string;
+      values: string[];
+    }[];
+    force_verify_image_resource: boolean;
   };
   media: {
-    file_info: any;
+    file_info: string;
   };
   ark: {
-    template_id: any;
-    kv: any;
+    template_id: number;
+    kv: {
+      key: string;
+      value: string;
+      obj: {
+        obj_kv: {
+          key: string;
+          value: string;
+        }[];
+      }[];
+    }[];
   };
   keyboard: {
-    id: any;
+    id: string;
     content: {
-      rows: any;
+      rows: {
+        buttons: {
+          id: string;
+          group_id: string;
+          render_data: {
+            label: string;
+            visited_label: string;
+            style: number;
+          };
+          action: {
+            type: number;
+            data: string;
+            permission: {
+              type: number;
+              specify_user_ids: string[];
+              specify_role_ids: string[];
+            };
+            enter: boolean;
+            reply: boolean;
+            unsupport_tips: string;
+            anchor: number;
+            click_limit: number;
+            modal: {
+              content: string;
+              confirm_text: string;
+              cancel_text: string;
+            };
+          };
+        }[];
+      }[];
     };
   };
 };
@@ -29,6 +70,6 @@ declare const toQQMessage: (content: OutgoingMessage) => {
 declare const handleFrameworkAction: (client: QQBotAPI, data: {
   action: string;
   payload: any;
-}, botId: string) => Promise<ClientAPIMessageResult[]>;
+}, botId: string) => Promise<import("alemonjs/common").Result<any>[]>;
 //#endregion
 export { handleFrameworkAction, toQQMessage };

package/lib/hook.d.ts

@@ -1,3 +1,4 @@
+import { QQBotAPI } from "./sdk/api.js";
 import { SUBSCRIBE_MESSAGE_STATUS_TYPE } from "./message/group/SUBSCRIBE_MESSAGE_STATUS.js";
 import { GROUP_MEMBER_ADD } from "./message/group/GROUP_MEMBER_ADD.js";
 import { GROUP_MEMBER_REMOVE } from "./message/group/GROUP_MEMBER_REMOVE.js";
@@ -76,7 +77,7 @@ declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [Eve
  * @param event
  * @returns
  */
-declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [any, EventValues[T]];
+declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [QQBotAPI, EventValues[T]];
 /**
  * 判断当前模式
  * @param event

package/lib/index.d.ts

@@ -7,6 +7,6 @@ import { useClient, useMode, useValue } from "./hook.js";
 import { QQBotGroupEventMap } from "./sdk/message.group.js";
 import { QQBotPublicEventMap } from "./sdk/message.public.js";
 //#region src/index.d.ts
-declare const _default: any;
+declare const _default: () => any;
 //#endregion
 export { QQBotAPI as API, type ApiRequestData, type ButtonType, type FileType, type GlobalMuteRule, type GroupAction, type JoinApprovalStrategy, type JoinRequest, type KeyboardType, type MarkdownType, type MemberMuteState, type MessageType, type Options, type QQBotArkData, type QQBotAttachment, type QQBotBlacklistUser, type QQBotGroupEventMap, type QQBotGroupMember, type QQBotInteractionResolved, type QQBotMenu, type QQBotMenuItem, type QQBotMessageContent, type QQBotMessageElement, type QQBotMessageResult, type QQBotMessageUser, type QQBotPage, type QQBotPanel, type QQBotPanelCreate, type QQBotPanelRecord, type QQBotPanelScope, type QQBotPublicEventMap, type QQTextSanitizerOptions, type SetMemberMuteState, type StreamMessageData, type StreamMessageResult, type UploadConfig, type UploadPart, type UploadPartFinishData, type UploadPrepareData, type UploadPrepareResult, type VerifyInfo, _default as default, platform, sanitizeQQText, useClient, useMode, useValue };

package/lib/sends.js

@@ -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 };
@@ -335,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 = {};
@@ -363,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 [];
 	}
@@ -383,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,
@@ -454,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 [];
 	}
@@ -469,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,
@@ -512,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)];
 	}
@@ -524,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.39",
+  "version": "2.1.40",
   "description": "QQ官方平台",
   "author": "lemonade",
   "license": "MIT",
@@ -12,12 +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:materials": "yarn build && node tests/materials.contract.mjs",
-    "test:mention": "yarn build && node tests/everyone.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",
@@ -101,5 +102,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "114f342c08cb3ebbfee39b1c93fb30607d276083"
+  "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.