@alemonjs/qq-bot 2.1.1 → 2.1.3

package/README.md

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

package/lib/config.d.ts

@@ -4,6 +4,7 @@ export type Options = {
     master_key?: string[];
     master_id?: string[];
     markdownToText?: 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"]) => 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) => string;
-export declare const dataEnumToText: (item: DataEnums) => 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,13 +1,15 @@
-const markdownToText = (items) => {
+const markdownToText = (items, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     return items
         .map(item => {
         switch (item.type) {
             case 'MD.text':
                 return item.value;
             case 'MD.title':
-                return `【${item.value}】\n`;
+                return hideUnsupported ? `${item.value}\n` : `【${item.value}】\n`;
             case 'MD.subtitle':
-                return `〖${item.value}〗\n`;
+                return hideUnsupported ? `${item.value}\n` : `〖${item.value}〗\n`;
             case 'MD.bold':
             case 'MD.italic':
             case 'MD.italicStar':
@@ -15,10 +17,12 @@ const markdownToText = (items) => {
                 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 '[图片]';
+                return hideUnsupported ? '' : '[图片]';
             case 'MD.list':
                 return (item.value
                     .map(li => {
@@ -31,7 +35,7 @@ const markdownToText = (items) => {
             case 'MD.blockquote':
                 return `> ${item.value}\n`;
             case 'MD.divider':
-                return '————————\n';
+                return hideUnsupported ? '' : '————————\n';
             case 'MD.newline':
                 return '\n';
             case 'MD.code':
@@ -44,22 +48,28 @@ const markdownToText = (items) => {
             case 'MD.content':
                 return item.value;
             case 'MD.button':
-                return `[${item.value}]`;
+                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 ?? '');
         }
     })
-        .join('');
+        .join('')
+        .trim();
 };
 const buttonsToText = (rows) => {
-    return rows
-        .map((row) => row.value.map((btn) => `[${btn.value}]`).join(' '))
-        .join('\n');
+    return rows.map((row) => row.value.map((btn) => `[${btn.value}]`).join(' ')).join('\n');
 };
-const markdownRawToText = (raw) => {
+const markdownRawToText = (raw, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     let text = raw;
-    text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, '[图片]');
-    text = text.replace(/\[([^\]]*)\]\([^)]*\)/g, '$1');
+    text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, hideUnsupported ? '' : '[图片]');
+    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');
@@ -71,21 +81,23 @@ const markdownRawToText = (raw) => {
         return match.replace(/```\w*\n?/g, '').trim();
     });
     text = text.replace(/^>\s+/gm, '');
-    text = text.replace(/^[-*_]{3,}\s*$/gm, '————————');
+    text = text.replace(/^[-*_]{3,}\s*$/gm, hideUnsupported ? '' : '————————');
     text = text.replace(/^[\s]*[-*+]\s+/gm, '· ');
     text = text.replace(/^[\s]*(\d+)\.\s+/gm, '$1. ');
     return text.trim();
 };
-const dataEnumToText = (item) => {
+const dataEnumToText = (item, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     switch (item.type) {
         case 'MarkdownOriginal':
-            return markdownRawToText(String(item.value));
+            return markdownRawToText(String(item.value), hideUnsupported);
         case 'Attachment':
-            return `[附件${item.options?.filename ? ': ' + item.options.filename : ''}]`;
+            return hideUnsupported ? '' : `[附件${item.options?.filename ? ': ' + item.options.filename : ''}]`;
         case 'Audio':
-            return '[音频]';
+            return hideUnsupported ? '' : '[音频]';
         case 'Video':
-            return '[视频]';
+            return hideUnsupported ? '' : '[视频]';
         default:
             return '';
     }

package/lib/sends.js

@@ -165,10 +165,18 @@ const formatMention = (item, mode) => {
 };
 const extractContent = (val, mode) => {
     const nativeTypes = new Set([
-        'Mention', 'Text', 'Link',
-        'Image', 'ImageFile', 'ImageURL',
-        'Markdown', 'BT.group', 'ButtonTemplate',
-        'Ark.list', 'Ark.Card', 'Ark.BigCard'
+        'Mention',
+        'Text',
+        'Link',
+        'Image',
+        'ImageFile',
+        'ImageURL',
+        'Markdown',
+        'BT.group',
+        'ButtonTemplate',
+        'Ark.list',
+        'Ark.Card',
+        'Ark.BigCard'
     ]);
     const nativeText = val
         .filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link')
@@ -185,9 +193,11 @@ const extractContent = (val, mode) => {
         return '';
     })
         .join('');
+    const config = getQQBotConfig();
+    const hide = config.hideUnsupported;
     const fallbackText = val
         .filter(item => !nativeTypes.has(item.type))
-        .map(item => dataEnumToText(item))
+        .map(item => dataEnumToText(item, hide))
         .filter(Boolean)
         .join('\n');
     return [nativeText, fallbackText].filter(Boolean).join('\n');
@@ -336,6 +346,10 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
         });
         return [createResult(ResultCode.Ok, label, { id: res.id })];
     }
+    if (config.hideUnsupported === true && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
+        logger.info('[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送');
+        return [];
+    }
     if (mdToText) {
         const textContent = flattenMdToText(content, val);
         if (textContent) {
@@ -399,6 +413,10 @@ 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 && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
+        logger.info('[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送');
+        return [];
+    }
     if (mdToText) {
         const textContent = flattenMdToText(content, val);
         if (textContent) {

package/package.json

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