mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 11:13:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant err check, return better message if file does not exist

Browse source
This commit is contained in:
Till Faelligen 2022-03-15 12:09:23 +01:00
parent 556d2d63dc
commit cb3d497d95
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mediaapi/routing/download.go
View file

@ -723,11 +723,11 @@ func (r *downloadRequest) fetchRemoteFile(
// create request for remote file // create request for remote file
resp, err := client.CreateMediaDownloadRequest(ctx, r.MediaMetadata.Origin, string(r.MediaMetadata.MediaID)) resp, err := client.CreateMediaDownloadRequest(ctx, r.MediaMetadata.Origin, string(r.MediaMetadata.MediaID))
if err != nil || resp.StatusCode != http.StatusOK { if err != nil || resp.StatusCode != http.StatusOK {
if resp.StatusCode == http.StatusNotFound {
return "", false, fmt.Errorf("File with media ID %q does not exist on %s", r.MediaMetadata.MediaID, r.MediaMetadata.Origin)
}
return "", false, fmt.Errorf("file with media ID %q could not be downloaded from %s", r.MediaMetadata.MediaID, r.MediaMetadata.Origin) return "", false, fmt.Errorf("file with media ID %q could not be downloaded from %s", r.MediaMetadata.MediaID, r.MediaMetadata.Origin)
} }
if err != nil {
return "", false, err
}
defer resp.Body.Close() // nolint: errcheck defer resp.Body.Close() // nolint: errcheck
// The reader returned here will be limited either by the Content-Length // The reader returned here will be limited either by the Content-Length