@alemonjs/qq-bot 2.1.2 → 2.1.4

package/README.md

@@ -47,8 +47,10 @@ qq-bot:
   # 启动md强制转换为text，特别是当没有md权限，但使用了md数据格式时
   markdownToText: true
   # 隐藏不支持的消息类型（可选，默认: false）
-  # 开启后，转为文本时不可读内容（如 [视频]、[音频]、[图片]、[附件] 等占位符）将被置空
-  # 可读内容（如标题、按钮文本、链接等）仍会保留为纯文本
+  # 1：一级隐藏，不可读占位符（[视频]、[音频]、[图片]、[附件]等）被置空，可读内容保留
+  # 2：二级隐藏，按钮仅显示指令数据（如 /挑战），链接仅显示 URL
+  # 3：三级隐藏，按钮和链接的 data 也不保留，完全隐藏
+  # 4：四级隐藏，不进行任何转换，降级数据直接丢弃
   # 转换后内容为空时，将跳过发送并输出 info 日志
-  hideUnsupported: true
+  hideUnsupported: 1
 ```

package/lib/config.d.ts

@@ -4,7 +4,7 @@ export type Options = {
     master_key?: string[];
     master_id?: string[];
     markdownToText?: boolean;
-    hideUnsupported?: boolean;
+    hideUnsupported?: boolean | number;
 } & sdkOptions;
 export declare const getQQBotConfig: () => Options;
 export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/format.d.ts

@@ -1,5 +1,5 @@
 import type { DataEnums, DataMarkDown } from 'alemonjs';
-export declare const markdownToText: (items: DataMarkDown["value"], hideUnsupported?: boolean) => string;
+export declare const markdownToText: (items: DataMarkDown["value"], hideUnsupported?: boolean | number) => string;
 export declare const buttonsToText: (rows: any[]) => string;
-export declare const markdownRawToText: (raw: string, hideUnsupported?: boolean) => string;
-export declare const dataEnumToText: (item: DataEnums, hideUnsupported?: boolean) => string;
+export declare const markdownRawToText: (raw: string, hideUnsupported?: boolean | number) => string;
+export declare const dataEnumToText: (item: DataEnums, hideUnsupported?: boolean | number) => string;

package/lib/format.js

@@ -1,4 +1,6 @@
 const markdownToText = (items, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     return items
         .map(item => {
         switch (item.type) {
@@ -15,7 +17,9 @@ const markdownToText = (items, hideUnsupported) => {
                 return item.value;
             case 'MD.link': {
                 const v = item.value;
-                return `${v.text}( ${v.url} )`;
+                if (Number(hideUnsupported) >= 3)
+                    return '';
+                return Number(hideUnsupported) >= 2 ? v.url : `${v.text}( ${v.url} )`;
             }
             case 'MD.image':
                 return hideUnsupported ? '' : '[图片]';
@@ -44,6 +48,11 @@ const markdownToText = (items, hideUnsupported) => {
             case 'MD.content':
                 return item.value;
             case 'MD.button':
+                if (Number(hideUnsupported) >= 3)
+                    return '';
+                if (Number(hideUnsupported) >= 2) {
+                    return item.options?.data || String(item.value);
+                }
                 return hideUnsupported ? String(item.value) : `[${item.value}]`;
             default:
                 return String(item?.value ?? '');
@@ -55,9 +64,11 @@ const buttonsToText = (rows) => {
     return rows.map((row) => row.value.map((btn) => `[${btn.value}]`).join(' ')).join('\n');
 };
 const markdownRawToText = (raw, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     let text = raw;
     text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, hideUnsupported ? '' : '[图片]');
-    text = text.replace(/\[([^\]]*)\]\([^)]*\)/g, '$1');
+    text = text.replace(/\[([^\]]*)\]\(([^)]*)\)/g, Number(hideUnsupported) >= 2 ? '$2' : '$1');
     text = text.replace(/^#{1,6}\s+/gm, '');
     text = text.replace(/(\*{3}|_{3})([^*_]+)\1/g, '$2');
     text = text.replace(/(\*{2}|_{2})([^*_]+)\1/g, '$2');
@@ -72,9 +83,11 @@ const markdownRawToText = (raw, hideUnsupported) => {
     text = text.replace(/^[-*_]{3,}\s*$/gm, hideUnsupported ? '' : '————————');
     text = text.replace(/^[\s]*[-*+]\s+/gm, '· ');
     text = text.replace(/^[\s]*(\d+)\.\s+/gm, '$1. ');
-    return text.trim();
+    return text;
 };
 const dataEnumToText = (item, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     switch (item.type) {
         case 'MarkdownOriginal':
             return markdownRawToText(String(item.value), hideUnsupported);

package/lib/sends.js

@@ -194,7 +194,7 @@ const extractContent = (val, mode) => {
     })
         .join('');
     const config = getQQBotConfig();
-    const hide = config.hideUnsupported === true;
+    const hide = config.hideUnsupported;
     const fallbackText = val
         .filter(item => !nativeTypes.has(item.type))
         .map(item => dataEnumToText(item, hide))
@@ -326,7 +326,7 @@ const flattenMdToText = (content, val) => {
             parts.push(buttonsToText(item.value));
         }
     }
-    return parts.filter(Boolean).join('\n');
+    return parts.filter(Boolean).join('\n').replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
 };
 const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label) => {
     const config = getQQBotConfig();
@@ -413,7 +413,7 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label) =>
         const res = await sendMessage({ content: imgContent, ...baseParams }, imageBuffer);
         return [createResult(ResultCode.Ok, label, { id: res?.id })];
     }
-    if (config.hideUnsupported === true && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
+    if (config.hideUnsupported && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
         logger.info('[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送');
         return [];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",