cheveguerra/whatsapp-web.js
1
0
Fork 0
mirror of https://github.com/cheveguerra/whatsapp-web.js.git synced 2026-04-21 04:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly resolve media that hasn't been downloaded (#763)

Browse Source 
* fix: correctly abort if media does not exist

* catch 404s

* dont throw for media that cant be fetched
This commit is contained in:
Pedro S. Lopez
2021-08-01 23:29:06 -04:00
committed by GitHub
parent 628b6e4d49
commit d9ccb6f276
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/structures/Message.js
View File

@@ -313,14 +313,18 @@ class Message extends Base {
if (msg.mediaData.mediaStage != 'RESOLVED') { if (msg.mediaData.mediaStage != 'RESOLVED') {
// try to resolve media // try to resolve media
await msg.downloadMedia(true, 1); await msg.downloadMedia({
downloadEvenIfExpensive: true,
rmrReason: 1
});
} }
if (msg.mediaData.mediaStage.includes('ERROR')) { if (msg.mediaData.mediaStage.includes('ERROR') || msg.mediaData.mediaStage === 'FETCHING') {
// media could not be downloaded // media could not be downloaded
return undefined; return undefined;
} }
try {
const decryptedMedia = await window.Store.DownloadManager.downloadAndDecrypt({ const decryptedMedia = await window.Store.DownloadManager.downloadAndDecrypt({
directPath: msg.directPath, directPath: msg.directPath,
encFilehash: msg.encFilehash, encFilehash: msg.encFilehash,
@@ -338,7 +342,10 @@ class Message extends Base {
mimetype: msg.mimetype, mimetype: msg.mimetype,
filename: msg.filename filename: msg.filename
}; };
} catch (e) {
if(e.status && e.status === 404) return undefined;
throw e;
}
}, this.id._serialized); }, this.id._serialized);
if (!result) return undefined; if (!result) return undefined;