@alemonjs/qq-bot 2.1.3 → 2.1.5

package/lib/format.js

@@ -58,8 +58,7 @@ const markdownToText = (items, hideUnsupported) => {
                 return String(item?.value ?? '');
         }
     })
-        .join('')
-        .trim();
+        .join('');
 };
 const buttonsToText = (rows) => {
     return rows.map((row) => row.value.map((btn) => `[${btn.value}]`).join(' ')).join('\n');
@@ -84,7 +83,7 @@ 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)

package/lib/sends.js

@@ -172,6 +172,7 @@ const extractContent = (val, mode) => {
         'ImageFile',
         'ImageURL',
         'Markdown',
+        'MarkdownOriginal',
         'BT.group',
         'ButtonTemplate',
         'Ark.list',
@@ -209,7 +210,7 @@ const buildBaseParams = (tag, messageId, interactionTag) => {
     return { msg_id: messageId };
 };
 const buildMdAndButtonsParams = (val) => {
-    const items = val.filter(item => item.type === 'Markdown' || item.type === 'BT.group' || item.type === 'ButtonTemplate');
+    const items = val.filter(item => item.type === 'Markdown' || item.type === 'MarkdownOriginal' || item.type === 'BT.group' || item.type === 'ButtonTemplate');
     if (items.length === 0) {
         return null;
     }
@@ -247,6 +248,14 @@ const buildMdAndButtonsParams = (val) => {
                 }
             }
         }
+        else if (item.type === 'MarkdownOriginal' && typeof item?.value === 'string') {
+            if (params['markdown']?.content) {
+                params['markdown'].content += '\n' + item.value;
+            }
+            else {
+                params['markdown'] = { content: item.value };
+            }
+        }
     }
     if (params['keyboard']?.content?.nextId !== undefined) {
         delete params['keyboard'].content.nextId;
@@ -326,7 +335,10 @@ 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();

package/package.json

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