@alemonjs/qq-bot 2.1.0 → 2.1.1

package/README.md

@@ -44,4 +44,6 @@ qq-bot:
   # 4) 域名代理模式
   # base_url_gateway: https://[your addr]
   # base_url_app_access_token: https://[your addr]
+  # 启动md强制转换为text，特别是当没有md权限，但使用了md数据格式时
+  markdownToText: true
 ```

package/lib/config.d.ts

@@ -3,6 +3,7 @@ export declare const platform = "qq-bot";
 export type Options = {
     master_key?: string[];
     master_id?: string[];
+    markdownToText?: boolean;
 } & sdkOptions;
 export declare const getQQBotConfig: () => Options;
 export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/format.d.ts

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

package/lib/format.js

@@ -0,0 +1,94 @@
+const markdownToText = (items) => {
+    return items
+        .map(item => {
+        switch (item.type) {
+            case 'MD.text':
+                return item.value;
+            case 'MD.title':
+                return `【${item.value}】\n`;
+            case 'MD.subtitle':
+                return `〖${item.value}〗\n`;
+            case 'MD.bold':
+            case 'MD.italic':
+            case 'MD.italicStar':
+            case 'MD.strikethrough':
+                return item.value;
+            case 'MD.link': {
+                const v = item.value;
+                return `${v.text}( ${v.url} )`;
+            }
+            case 'MD.image':
+                return '[图片]';
+            case 'MD.list':
+                return (item.value
+                    .map(li => {
+                    if (typeof li.value === 'object') {
+                        return `${li.value.index}. ${li.value.text ?? ''}`;
+                    }
+                    return `· ${li.value}`;
+                })
+                    .join('\n') + '\n');
+            case 'MD.blockquote':
+                return `> ${item.value}\n`;
+            case 'MD.divider':
+                return '————————\n';
+            case 'MD.newline':
+                return '\n';
+            case 'MD.code':
+                return item.value;
+            case 'MD.mention':
+                if (item.value === 'everyone') {
+                    return '@全体成员';
+                }
+                return `@${item.value ?? ''}`;
+            case 'MD.content':
+                return item.value;
+            case 'MD.button':
+                return `[${item.value}]`;
+            default:
+                return String(item?.value ?? '');
+        }
+    })
+        .join('');
+};
+const buttonsToText = (rows) => {
+    return rows
+        .map((row) => row.value.map((btn) => `[${btn.value}]`).join(' '))
+        .join('\n');
+};
+const markdownRawToText = (raw) => {
+    let text = raw;
+    text = text.replace(/!\[([^\]]*)\]\([^)]*\)/g, '[图片]');
+    text = text.replace(/\[([^\]]*)\]\([^)]*\)/g, '$1');
+    text = text.replace(/^#{1,6}\s+/gm, '');
+    text = text.replace(/(\*{3}|_{3})([^*_]+)\1/g, '$2');
+    text = text.replace(/(\*{2}|_{2})([^*_]+)\1/g, '$2');
+    text = text.replace(/(?<!\*)\*(?!\*)([^*]+)(?<!\*)\*(?!\*)/g, '$1');
+    text = text.replace(/(?<!_)_(?!_)([^_]+)(?<!_)_(?!_)/g, '$1');
+    text = text.replace(/~~([^~]+)~~/g, '$1');
+    text = text.replace(/`([^`]+)`/g, '$1');
+    text = text.replace(/```[\s\S]*?```/g, match => {
+        return match.replace(/```\w*\n?/g, '').trim();
+    });
+    text = text.replace(/^>\s+/gm, '');
+    text = text.replace(/^[-*_]{3,}\s*$/gm, '————————');
+    text = text.replace(/^[\s]*[-*+]\s+/gm, '· ');
+    text = text.replace(/^[\s]*(\d+)\.\s+/gm, '$1. ');
+    return text.trim();
+};
+const dataEnumToText = (item) => {
+    switch (item.type) {
+        case 'MarkdownOriginal':
+            return markdownRawToText(String(item.value));
+        case 'Attachment':
+            return `[附件${item.options?.filename ? ': ' + item.options.filename : ''}]`;
+        case 'Audio':
+            return '[音频]';
+        case 'Video':
+            return '[视频]';
+        default:
+            return '';
+    }
+};
+
+export { buttonsToText, dataEnumToText, markdownRawToText, markdownToText };

package/lib/sends.js

@@ -1,6 +1,8 @@
 import { readFileSync } from 'fs';
 import { createResult, ResultCode } from 'alemonjs';
 import axios from 'axios';
+import { dataEnumToText, markdownToText, buttonsToText } from './format.js';
+import { getQQBotConfig } from './config.js';
 
 const MAX_BUTTON_ROWS = 5;
 const MAX_BUTTONS_PER_ROW = 5;
@@ -162,7 +164,13 @@ const formatMention = (item, mode) => {
     return '';
 };
 const extractContent = (val, mode) => {
-    return val
+    const nativeTypes = new Set([
+        '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')
         .map(item => {
         if (item.type === 'Link') {
@@ -177,6 +185,12 @@ const extractContent = (val, mode) => {
         return '';
     })
         .join('');
+    const fallbackText = val
+        .filter(item => !nativeTypes.has(item.type))
+        .map(item => dataEnumToText(item))
+        .filter(Boolean)
+        .join('\n');
+    return [nativeText, fallbackText].filter(Boolean).join('\n');
 };
 const buildBaseParams = (tag, messageId, interactionTag) => {
     if (tag === interactionTag) {
@@ -288,23 +302,53 @@ const resolveRichMediaUrl = async (images, uploadMedia) => {
     }
     return undefined;
 };
+const flattenMdToText = (content, val) => {
+    const mdItems = val.filter(item => item.type === 'Markdown');
+    const btnItems = val.filter(item => item.type === 'BT.group');
+    const parts = [content];
+    for (const item of mdItems) {
+        if (item.type === 'Markdown' && typeof item.value !== 'string') {
+            parts.push(markdownToText(item.value));
+        }
+    }
+    for (const item of btnItems) {
+        if (item.type === 'BT.group' && typeof item.value !== 'string') {
+            parts.push(buttonsToText(item.value));
+        }
+    }
+    return parts.filter(Boolean).join('\n');
+};
 const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label) => {
+    const config = getQQBotConfig();
+    const mdToText = config.markdownToText === true;
     const images = filterImages(val);
     if (images.length > 0) {
         const url = await resolveRichMediaUrl(images, uploadMedia);
         if (!url) {
             return [createResult(ResultCode.Fail, '图片上传失败', null)];
         }
+        const imgContent = flattenMdToText(content, val);
         const res = await sendMessage({
-            content,
+            content: imgContent,
             media: { file_info: url },
             msg_type: 7,
             ...baseParams
         });
         return [createResult(ResultCode.Ok, label, { id: res.id })];
     }
+    if (mdToText) {
+        const textContent = flattenMdToText(content, val);
+        if (textContent) {
+            const res = await sendMessage({ content: textContent, msg_type: 0, ...baseParams });
+            return [createResult(ResultCode.Ok, label, { id: res.id })];
+        }
+        return [];
+    }
     const mdParams = buildMdAndButtonsParams(val);
     if (mdParams) {
+        if (mdParams.markdown?.content && content) {
+            mdParams.markdown.content = content + '\n' + mdParams.markdown.content;
+        }
         const res = await sendMessage({ content, msg_type: 2, ...mdParams, ...baseParams });
         return [createResult(ResultCode.Ok, label, { id: res.id })];
     }
@@ -346,14 +390,28 @@ const resolveImageBuffer = async (images) => {
     return null;
 };
 const sendGuildMessage = async (content, val, baseParams, sendMessage, label) => {
+    const config = getQQBotConfig();
+    const mdToText = config.markdownToText === true;
     const images = filterImages(val);
     if (images.length > 0) {
         const imageBuffer = await resolveImageBuffer(images);
-        const res = await sendMessage({ content, ...baseParams }, imageBuffer);
+        const imgContent = flattenMdToText(content, val);
+        const res = await sendMessage({ content: imgContent, ...baseParams }, imageBuffer);
         return [createResult(ResultCode.Ok, label, { id: res?.id })];
     }
+    if (mdToText) {
+        const textContent = flattenMdToText(content, val);
+        if (textContent) {
+            const res = await sendMessage({ content: textContent, ...baseParams });
+            return [createResult(ResultCode.Ok, label, { id: res?.id })];
+        }
+        return [];
+    }
     const mdParams = buildMdAndButtonsParams(val);
     if (mdParams) {
+        if (mdParams.markdown?.content && content) {
+            mdParams.markdown.content = content + '\n' + mdParams.markdown.content;
+        }
         const res = await sendMessage({ content: '', ...mdParams, ...baseParams });
         return [createResult(ResultCode.Ok, label, { id: res.id })];
     }

package/lib/types.d.ts

@@ -0,0 +1,48 @@
+export type DataArkListTip = {
+    type: 'Ark.listTip';
+    value: {
+        desc: string;
+        prompt: string;
+    };
+};
+export type DataArkListItem = {
+    type: 'Ark.listItem';
+    value: string | {
+        title: string;
+        link: string;
+    };
+};
+export type DataArkListContent = {
+    type: 'Ark.listContent';
+    value: DataArkListItem[];
+};
+export type DataArkList = {
+    type: 'Ark.list';
+    value: [DataArkListTip, DataArkListContent];
+};
+export type DataArkCard = {
+    type: 'Ark.Card';
+    value: {
+        title: string;
+        cover: string;
+        link: string;
+        subtitle: string;
+        decs: string;
+        prompt: string;
+        metadecs: string;
+    };
+};
+export type DataArkBigCard = {
+    type: 'Ark.BigCard';
+    value: {
+        title: string;
+        subtitle: string;
+        cover: string;
+        link: string;
+        prompt: string;
+    };
+};
+export type DataButtonTemplate = {
+    type: 'ButtonTemplate';
+    value: string;
+};

package/lib/types.js

@@ -0,0 +1 @@
+

package/package.json

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