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

package/lib/sends.js

@@ -230,45 +230,37 @@ const filterImages = (val) => {
     return val.filter(item => item.type === 'Image' || item.type === 'ImageFile' || item.type === 'ImageURL');
 };
 const resolveRichMediaUrl = async (images, uploadMedia) => {
-    let url = '';
     for (const item of images) {
-        if (url) {
-            break;
-        }
+        let fileData;
+        let fileInfo;
         if (item.type === 'ImageURL') {
-            url = item.value;
+            fileData = await axios.get(item.value, { responseType: 'arraybuffer' }).then(res => Buffer.from(res.data, 'binary').toString('base64'));
         }
-        else if (item.type === 'ImageFile' || item.type === 'Image') {
-            let fileData;
-            if (item.type === 'ImageFile') {
-                fileData = readFileSync(item.value, 'base64');
+        else if (item.type === 'Image') {
+            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'));
+            }
+            else if (typeof item.value === 'string' && item.value.startsWith('file://')) {
+                const localFilePath = item.value.replace('file://', '');
+                fileData = readFileSync(localFilePath, '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;
-                }
+            else if (typeof item.value === 'string' && item.value.startsWith('base64://')) {
+                fileData = item.value.replace('base64://', '');
             }
-            const fileInfo = await uploadMedia({ file_type: 1, file_data: fileData }).then(res => res?.file_info);
-            if (fileInfo) {
-                url = fileInfo;
+            else if (Buffer.isBuffer(item.value)) {
+                fileData = item.value.toString('base64');
             }
         }
+        else if (item.type === 'ImageFile') {
+            fileData = readFileSync(item.value, 'base64');
+        }
+        if (fileData) {
+            fileInfo = await uploadMedia({ file_type: 1, file_data: fileData }).then(res => res?.file_info);
+        }
+        if (fileInfo) {
+            return fileInfo;
+        }
     }
-    return url;
 };
 const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label) => {
     const images = filterImages(val);

package/package.json

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