@alemonjs/kook 2.1.2 → 2.1.4

package/README.md

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

package/lib/config.d.ts

@@ -3,7 +3,7 @@ export type Options = {
     token: string;
     master_key?: string[];
     master_id?: string[];
-    hideUnsupported?: boolean;
+    hideUnsupported?: boolean | number;
 };
 export declare const getKOOKConfig: () => Options;
 export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/format.d.ts

@@ -1,4 +1,4 @@
 import type { DataEnums, DataMarkDown } from 'alemonjs';
-export declare const markdownToKMarkdown: (items: DataMarkDown["value"], hideUnsupported?: boolean) => string;
-export declare const markdownRawToKMarkdown: (raw: string, hideUnsupported?: boolean) => string;
-export declare const dataEnumToKMarkdown: (item: DataEnums, hideUnsupported?: boolean) => string;
+export declare const markdownToKMarkdown: (items: DataMarkDown["value"], hideUnsupported?: boolean | number) => string;
+export declare const markdownRawToKMarkdown: (raw: string, hideUnsupported?: boolean | number) => string;
+export declare const dataEnumToKMarkdown: (item: DataEnums, hideUnsupported?: boolean | number) => string;

package/lib/format.js

@@ -1,4 +1,6 @@
 const markdownToKMarkdown = (items, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     return items
         .map(item => {
         switch (item.type) {
@@ -17,7 +19,9 @@ const markdownToKMarkdown = (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 ? '' : '[图片]';
@@ -48,6 +52,11 @@ const markdownToKMarkdown = (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 ?? '');
@@ -56,11 +65,15 @@ const markdownToKMarkdown = (items, hideUnsupported) => {
         .join('');
 };
 const markdownRawToKMarkdown = (raw, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     let text = raw;
     text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, hideUnsupported ? '' : '[图片]');
     return text;
 };
 const dataEnumToKMarkdown = (item, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     switch (item.type) {
         case 'Markdown':
             return markdownToKMarkdown(item.value, hideUnsupported);

package/lib/index.js

@@ -329,12 +329,12 @@ const main = () => {
     });
     const formatKookContent = (val) => {
         const nativeItems = val.filter(item => item.type === 'Mention' || item.type === 'Text' || item.type === 'Link');
-        const unsupportedItems = val.filter(item => item.type !== 'Mention'
-            && item.type !== 'Text'
-            && item.type !== 'Link'
-            && item.type !== 'Image'
-            && item.type !== 'ImageURL'
-            && item.type !== 'ImageFile');
+        const unsupportedItems = val.filter(item => item.type !== 'Mention' &&
+            item.type !== 'Text' &&
+            item.type !== 'Link' &&
+            item.type !== 'Image' &&
+            item.type !== 'ImageURL' &&
+            item.type !== 'ImageFile');
         const nativeText = nativeItems
             .map(item => {
             if (item.type === 'Link') {
@@ -373,14 +373,14 @@ const main = () => {
             return '';
         })
             .join('');
-        const hide = getKOOKConfig().hideUnsupported === true;
+        const hide = getKOOKConfig().hideUnsupported;
         const fallbackText = unsupportedItems.length > 0
             ? unsupportedItems
                 .map(item => dataEnumToKMarkdown(item, hide))
                 .filter(Boolean)
                 .join('')
             : '';
-        return [nativeText, fallbackText].filter(Boolean).join('');
+        return [nativeText, fallbackText].filter(Boolean).join('').replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
     };
     const resolveImageBuffer = async (val) => {
         const images = val.filter(item => item.type === 'Image' || item.type === 'ImageFile' || item.type === 'ImageURL');
@@ -432,7 +432,7 @@ const main = () => {
         const content = formatKookContent(val);
         try {
             const imageUrl = await uploadAndGetImageUrl(val);
-            if (getKOOKConfig().hideUnsupported === true && !content && !imageUrl) {
+            if (getKOOKConfig().hideUnsupported && !content && !imageUrl) {
                 logger.info('[kook] hideUnsupported: 消息内容转换后为空，跳过发送');
                 return [];
             }
@@ -478,7 +478,7 @@ const main = () => {
         const content = formatKookContent(val);
         try {
             const imageUrl = await uploadAndGetImageUrl(val);
-            if (getKOOKConfig().hideUnsupported === true && !content && !imageUrl) {
+            if (getKOOKConfig().hideUnsupported && !content && !imageUrl) {
                 logger.info('[kook] hideUnsupported: 消息内容转换后为空，跳过发送');
                 return [];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "kook platform connection",
   "author": "lemonade",
   "license": "MIT",