sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Make the linter happy

Browse source
This commit is contained in:
Till Faelligen 2024-06-19 12:05:30 +02:00
parent aeee46bb71
commit 51f6dcbdc5
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mediaapi/routing/download.go
View file

@ -370,7 +370,7 @@ func (r *downloadRequest) respondFromLocalFile(
}).Trace("Responding with file") }).Trace("Responding with file")
responseFile = file responseFile = file
responseMetadata = r.MediaMetadata responseMetadata = r.MediaMetadata
if err := r.addDownloadFilenameToHeaders(w, responseMetadata); err != nil { if err = r.addDownloadFilenameToHeaders(w, responseMetadata); err != nil {
return nil, err return nil, err
} }
} }
@ -385,7 +385,7 @@ func (r *downloadRequest) respondFromLocalFile(
w.Header().Set("Content-Security-Policy", contentSecurityPolicy) w.Header().Set("Content-Security-Policy", contentSecurityPolicy)
if !r.forFederation { if !r.forFederation {
if _, err := io.Copy(w, responseFile); err != nil { if _, err = io.Copy(w, responseFile); err != nil {
return nil, fmt.Errorf("io.Copy: %w", err) return nil, fmt.Errorf("io.Copy: %w", err)
} }
} else { } else {
@ -814,6 +814,7 @@ func (r *downloadRequest) GetContentLengthAndReader(contentLengthHeader string,
return contentLength, reader, nil return contentLength, reader, nil
} }
// nolint: gocyclo
func (r *downloadRequest) fetchRemoteFile( func (r *downloadRequest) fetchRemoteFile(
ctx context.Context, ctx context.Context,
client *fclient.Client, client *fclient.Client,
@ -844,7 +845,8 @@ func (r *downloadRequest) fetchRemoteFile(
var parseErr error var parseErr error
if isMultiPart { if isMultiPart {
r.Logger.Info("Downloaded file using authenticated endpoint") r.Logger.Info("Downloaded file using authenticated endpoint")
_, params, err := mime.ParseMediaType(resp.Header.Get("Content-Type")) var params map[string]string
_, params, err = mime.ParseMediaType(resp.Header.Get("Content-Type"))
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -855,7 +857,8 @@ func (r *downloadRequest) fetchRemoteFile(
first := true first := true
for { for {
p, err := mr.NextPart() var p *multipart.Part
p, err = mr.NextPart()
if err == io.EOF { if err == io.EOF {
break break
} }