@alemonjs/qq-bot 2.1.0-alpha.23 → 2.1.0-alpha.25

package/lib/sends.js

@@ -97,10 +97,10 @@ const mdFormatters = {
         if (belong === 'channel') {
             return '';
         }
-        if (belong === 'all') {
-            return '<qqbot-at-everyone />';
+        if (belong === 'user') {
+            return `<qqbot-at-user id="${value}" />`;
         }
-        if (value === 'everyone' || value === 'all' || value === '' || typeof value !== 'string') {
+        if (value === 'everyone') {
             return '<qqbot-at-everyone />';
         }
         return `<qqbot-at-user id="${value}" />`;
@@ -239,7 +239,29 @@ const resolveRichMediaUrl = async (images, uploadMedia) => {
             url = item.value;
         }
         else if (item.type === 'ImageFile' || item.type === 'Image') {
-            const fileData = item.type === 'ImageFile' ? readFileSync(item.value, 'base64') : item.value;
+            let fileData;
+            if (item.type === 'ImageFile') {
+                fileData = readFileSync(item.value, 'base64');
+            }
+            else {
+                if (typeof item.value === 'string' && (item.value.startsWith('https://') || item.value.startsWith('http://'))) {
+                    fileData = await axios.get(item.value, { responseType: 'arraybuffer' }).then(res => Buffer.from(res.data, 'binary').toString('base64'));
+                    continue;
+                }
+                else if (typeof item.value === 'string' && item.value.startsWith('file://')) {
+                    const localFilePath = item.value.replace('file://', '');
+                    fileData = readFileSync(localFilePath, 'base64');
+                    continue;
+                }
+                else if (typeof item.value === 'string' && item.value.startsWith('base64://')) {
+                    fileData = item.value.replace('base64://', '');
+                    continue;
+                }
+                else if (Buffer.isBuffer(item.value)) {
+                    fileData = item.value.toString('base64');
+                    continue;
+                }
+            }
             const fileInfo = await uploadMedia({ file_type: 1, file_data: fileData }).then(res => res?.file_info);
             if (fileInfo) {
                 url = fileInfo;

package/package.json

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