diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-11-03 15:03:12 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-11-03 15:03:12 +0100 |
| commit | 1dfa7fe0d51b75792db7b0c28ffad7d1f650834d (patch) | |
| tree | 0af4de062d33e6c292d8b42dbf4d13f16125b959 /internal/api/client/fileserver | |
| parent | [bugfix] Use []rune to check length of user-submitted text (#948) (diff) | |
| download | gotosocial-1dfa7fe0d51b75792db7b0c28ffad7d1f650834d.tar.xz | |
[bugfix] Wrap media in read closer (#941)
* use readcloser for content.Content
* call media postdata function no matter what
* return a readcloser from data func
* tidy of logic of readertostore
* fix whoopsie
Diffstat (limited to 'internal/api/client/fileserver')
| -rw-r--r-- | internal/api/client/fileserver/servefile.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/internal/api/client/fileserver/servefile.go b/internal/api/client/fileserver/servefile.go index 236a2d8ac..e4eca770f 100644 --- a/internal/api/client/fileserver/servefile.go +++ b/internal/api/client/fileserver/servefile.go @@ -20,7 +20,6 @@ package fileserver import ( "fmt" - "io" "net/http" "strconv" @@ -86,12 +85,10 @@ func (m *FileServer) ServeFile(c *gin.Context) { } defer func() { - // if the content is a ReadCloser (ie., it's streamed from storage), close it when we're done + // close content when we're done if content.Content != nil { - if closer, ok := content.Content.(io.ReadCloser); ok { - if err := closer.Close(); err != nil { - log.Errorf("ServeFile: error closing readcloser: %s", err) - } + if err := content.Content.Close(); err != nil { + log.Errorf("ServeFile: error closing readcloser: %s", err) } } }() |