@alemonjs/discord 2.1.2 → 2.1.4

package/README.md

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

package/lib/config.d.ts

@@ -6,7 +6,7 @@ export interface Options {
     shard?: number[];
     master_key?: string[];
     master_id?: string[];
-    hideUnsupported?: boolean;
+    hideUnsupported?: boolean | number;
 }
 export declare const platform = "discord";
 export declare const getDiscordConfig: () => Options & {

package/lib/format.d.ts

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

package/lib/format.js

@@ -1,4 +1,6 @@
-const markdownToDiscordText = (items) => {
+const markdownToDiscordText = (items, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     return items
         .map(item => {
         switch (item.type) {
@@ -17,7 +19,9 @@ const markdownToDiscordText = (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 `![image](${item.value})`;
@@ -48,6 +52,11 @@ const markdownToDiscordText = (items) => {
             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 `[${item.value}]`;
             default:
                 return String(item?.value ?? '');
@@ -56,11 +65,15 @@ const markdownToDiscordText = (items) => {
         .join('');
 };
 const markdownRawToDiscordText = (raw, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     let text = raw;
     text = text.replace(/!\[([^\]]*)\]\(([^)]*)\)/g, hideUnsupported ? '' : '[$1]($2)');
     return text;
 };
 const dataEnumToDiscordText = (item, hideUnsupported) => {
+    if (Number(hideUnsupported) >= 4)
+        return '';
     switch (item.type) {
         case 'MarkdownOriginal':
             return markdownRawToDiscordText(String(item.value), hideUnsupported);

package/lib/send.js

@@ -102,7 +102,7 @@ const sendchannel = async (client, param, val) => {
         const mds = val.filter(item => item.type === 'Markdown');
         const nativeTypes = new Set(['Image', 'ImageURL', 'ImageFile', 'BT.group', 'Markdown', 'Mention', 'Text', 'Link']);
         const unsupportedItems = val.filter(item => !nativeTypes.has(item.type));
-        const hide = getDiscordConfig().hideUnsupported === true;
+        const hide = getDiscordConfig().hideUnsupported;
         const fallbackText = unsupportedItems
             .map(item => dataEnumToDiscordText(item, hide))
             .filter(Boolean)
@@ -143,7 +143,7 @@ const sendchannel = async (client, param, val) => {
         })
             .join('');
         const contentMd = buildDiscordMdContent(mds);
-        const finalContent = [content, contentMd, fallbackText].filter(Boolean).join('\n');
+        const finalContent = [content, contentMd, fallbackText].filter(Boolean).join('\n').replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
         if (hide && !finalContent && images.length <= 0 && buttons.length <= 0) {
             logger.info('[discord] hideUnsupported: 消息内容转换后为空，跳过发送');
             return [];

package/package.json

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