MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-12-14 01:14:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #479 from mautrix/fix-media-fail-error

Browse source 
improve error when media is not present on WA servers
This commit is contained in:
Sumner Evans 2022-04-22 11:52:36 -06:00 committed by GitHub
commit 7772b7e15c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
portal.go
View file

@ -2173,13 +2173,25 @@ func (portal *Portal) convertMediaMessage(intent *appservice.IntentAPI, source *
// portal.log.Errorfln("Failed to send media retry receipt for %s: %v", info.ID, err) // portal.log.Errorfln("Failed to send media retry receipt for %s: %v", info.ID, err)
//} //}
converted.Error = database.MsgErrMediaNotFound converted.Error = database.MsgErrMediaNotFound
errorText := "Old photo or attachment."
if portal.bridge.Config.Bridge.HistorySync.BackfillMedia {
if len(portal.bridge.Config.Bridge.HistorySync.Media) > 0 {
errorText += " Media will be requested from your phone later."
} else {
errorText += ` React with the \u267b (recycle) emoji or the text "click to retry" to request this media from your phone or use the backfill command to request all missing media for this chat.`
}
} else {
errorText += ` Automatic media backfill is disabled. React with the \u267b (recycle) emoji or the text "click to retry" to request this media from your phone.`
}
return portal.makeMediaBridgeFailureMessage(info, err, converted, &FailedMediaKeys{ return portal.makeMediaBridgeFailureMessage(info, err, converted, &FailedMediaKeys{
Key: msg.GetMediaKey(), Key: msg.GetMediaKey(),
Length: int(msg.GetFileLength()), Length: int(msg.GetFileLength()),
Type: whatsmeow.GetMediaType(msg), Type: whatsmeow.GetMediaType(msg),
SHA256: msg.GetFileSha256(), SHA256: msg.GetFileSha256(),
EncSHA256: msg.GetFileEncSha256(), EncSHA256: msg.GetFileEncSha256(),
}, "Old photo or attachment. This will sync in a future update.") }, errorText)
} else if errors.Is(err, whatsmeow.ErrNoURLPresent) { } else if errors.Is(err, whatsmeow.ErrNoURLPresent) {
portal.log.Debugfln("No URL present error for media message %s, ignoring...", info.ID) portal.log.Debugfln("No URL present error for media message %s, ignoring...", info.ID)
return nil return nil