@rexxhayanasi/elaina-baileys 1.2.1-rc.2 → 1.2.1-rc.3

package/lib/Utils/messages.js

@@ -107,80 +107,85 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
 
-const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
+    const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
 
-if (isNewsletter) {
-    logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
+    if (isNewsletter) {
+        logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
 
-    const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
-        uploadData.media,
-        options.mediaTypeOverride || mediaType,
-        logger
-    );
+        const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
+            uploadData.media,
+            options.mediaTypeOverride || mediaType,
+            logger
+        );
 
-    const fileSha256B64 = fileSha256.toString('base64');
+        const fileSha256B64 = fileSha256.toString('base64');
 
-    try {
-        if (mediaType === 'video' || mediaType === 'image') {
-            const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(filePath, mediaType, options);
-            uploadData.jpegThumbnail = thumbnail;
+        try {
+            if (mediaType === 'video' || mediaType === 'image') {
+                const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(filePath, mediaType, options);
+                if (!uploadData.jpegThumbnail) uploadData.jpegThumbnail = thumbnail;
 
-            if (!uploadData.width && originalImageDimensions) {
-                uploadData.width = originalImageDimensions.width;
-                uploadData.height = originalImageDimensions.height;
+                if (!uploadData.width && originalImageDimensions) {
+                    uploadData.width = originalImageDimensions.width;
+                    uploadData.height = originalImageDimensions.height;
+                }
             }
-        }
 
-        if (mediaType === 'audio' || mediaType === 'video') {
-            if (typeof uploadData.seconds === 'undefined') {
-                uploadData.seconds = await (0, messages_media_1.getAudioDuration)(filePath);
+            if (mediaType === 'audio' || mediaType === 'video') {
+                if (typeof uploadData.seconds === 'undefined') {
+                     uploadData.seconds = await (0, messages_media_1.getAudioDuration)(filePath);
+                }
             }
-        }
 
-        if (mediaType === 'audio' && uploadData.ptt === true) {
-            uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(filePath, logger);
+            if (mediaType === 'audio' && uploadData.ptt === true) {
+                uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(filePath, logger);
+            }
+
+        } catch (err) {
+            logger === null || logger === void 0 ? void 0 : logger.warn({ trace: err.stack }, 'Metadata generation failed');
         }
-    } catch (err) {
-        logger === null || logger === void 0 ? void 0 : logger.warn({ trace: err.stack }, 'Failed to generate metadata for newsletter media');
-    }
 
-    const streamToUpload = (0, fs_1.createReadStream)(filePath);
+        const streamToUpload = (0, fs_1.createReadStream)(filePath);
 
-    const { mediaUrl, directPath } = await options.upload(streamToUpload, {
-        fileEncSha256B64: fileSha256B64,
-        mediaType: mediaType,
-        timeoutMs: options.mediaUploadTimeoutMs
-    });
+        const uploaded = await options.upload(streamToUpload, {
+            fileEncSha256B64: fileSha256B64,
+            mediaType: mediaType,
+            timeoutMs: options.mediaUploadTimeoutMs
+        });
 
-    await fs_1.promises.unlink(filePath);
+        await fs_1.promises.unlink(filePath);
 
-    const obj = Types_1.WAProto.Message.fromObject({
-        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-            url: mediaUrl,
-            directPath,
-            fileSha256,
-            fileLength,
-            ...uploadData,
-            media: undefined
-        })
-    });
+        const finalUrl = uploaded.mediaUrl || uploaded.url || `https://mmg.whatsapp.net${uploaded.directPath}`;
 
-    if (uploadData.ptv) {
-        obj.ptvMessage = obj.videoMessage;
-        delete obj.videoMessage;
-    }
+        const obj = Types_1.WAProto.Message.fromObject({
+            [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
+                url: finalUrl,
+                directPath: uploaded.directPath,
+                mediaKey: undefined,
+                fileEncSha256: undefined,
+                fileSha256,
+                fileLength,
+                staticUrl: uploaded.handle ? finalUrl : undefined,
+                ...uploadData,
+                media: undefined
+            })
+        });
 
-    if (obj.stickerMessage) {
-        obj.stickerMessage.stickerSentTs = Date.now();
-    }
+        if (uploadData.ptv) {
+            obj.ptvMessage = obj.videoMessage;
+            delete obj.videoMessage;
+        }
 
-    if (cacheableKey) {
-        logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
-        options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
-    }
+        if (obj.stickerMessage) {
+            obj.stickerMessage.stickerSentTs = Date.now();
+        }
 
-    return obj;
-}
+        if (cacheableKey) {
+            options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+        }
+
+        return obj;
+    }
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
         (typeof uploadData['jpegThumbnail'] === 'undefined');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.2.1-rc.2",
+  "version": "1.2.1-rc.3",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -53,7 +53,6 @@
     "audio-decode": "^2.1.3",
     "axios": "^1.6.0",
     "chalk": "^4.1.2",
-    "fflate": "^0.8.2",
     "gradient-string": "^2.0.2",
     "cache-manager": "^5.7.6",
     "cheerio": "^1.0.0-rc.12",