eddy/whatsapp-web.js
Watch
1
0
Fork
You've already forked whatsapp-web.js
 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Fix downloading media for WhatsApp Web v2.2126.10 (#735)

Browse source 
* fix downloadMedia

* return a boolean for hasMedia
This commit is contained in:
Pedro S. Lopez 2021-07-09 02:38:31 -04:00 • committed by GitHub
commit 0ef6061d7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/structures/Message.js
View file

@ -41,7 +41,7 @@ class Message extends Base {
* Indicates if the message has media available for download
* @type {boolean}
*/
this.hasMedia = data.clientUrl || data.deprecatedMms3Url;
this.hasMedia = Boolean(data.mediaKey && data.directPath);
/**
* Message content
@ -312,14 +312,20 @@ class Message extends Base {
return undefined;
}
const mediaUrl = msg.clientUrl || msg.deprecatedMms3Url;
const decryptedMedia = await window.Store.DownloadManager.downloadAndDecrypt({
directPath: msg.directPath,
encFilehash: msg.encFilehash,
filehash: msg.filehash,
mediaKey: msg.mediaKey,
mediaKeyTimestamp: msg.mediaKeyTimestamp,
type: msg.type,
signal: (new AbortController).signal
});
const buffer = await window.WWebJS.downloadBuffer(mediaUrl);
const decrypted = await window.Store.CryptoLib.decryptE2EMedia(msg.type, buffer, msg.mediaKey, msg.mimetype);
const data = await window.WWebJS.readBlobAsync(decrypted._blob);
const data = window.WWebJS.arrayBufferToBase64(decryptedMedia);
return {
data: data.split(',')[1],
data,
mimetype: msg.mimetype,
filename: msg.filename
};