From 1dfa7fe0d51b75792db7b0c28ffad7d1f650834d Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Thu, 3 Nov 2022 15:03:12 +0100
Subject: [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
---
 internal/federation/dereferencing/account.go | 4 ++--
 internal/federation/dereferencing/emoji.go   | 2 +-
 internal/federation/dereferencing/media.go   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'internal/federation')

diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go
index dfe7693fb..21900d47b 100644
--- a/internal/federation/dereferencing/account.go
+++ b/internal/federation/dereferencing/account.go
@@ -496,7 +496,7 @@ func (d *deref) fetchRemoteAccountMedia(ctx context.Context, targetAccount *gtsm
 				}
 			}
 
-			data := func(innerCtx context.Context) (io.Reader, int64, error) {
+			data := func(innerCtx context.Context) (io.ReadCloser, int64, error) {
 				return t.DereferenceMedia(innerCtx, avatarIRI)
 			}
 
@@ -562,7 +562,7 @@ func (d *deref) fetchRemoteAccountMedia(ctx context.Context, targetAccount *gtsm
 				}
 			}
 
-			data := func(innerCtx context.Context) (io.Reader, int64, error) {
+			data := func(innerCtx context.Context) (io.ReadCloser, int64, error) {
 				return t.DereferenceMedia(innerCtx, headerIRI)
 			}
 
diff --git a/internal/federation/dereferencing/emoji.go b/internal/federation/dereferencing/emoji.go
index 3cdb1d52d..2d32c8803 100644
--- a/internal/federation/dereferencing/emoji.go
+++ b/internal/federation/dereferencing/emoji.go
@@ -42,7 +42,7 @@ func (d *deref) GetRemoteEmoji(ctx context.Context, requestingUsername string, r
 		return nil, fmt.Errorf("GetRemoteEmoji: error parsing url: %s", err)
 	}
 
-	dataFunc := func(innerCtx context.Context) (io.Reader, int64, error) {
+	dataFunc := func(innerCtx context.Context) (io.ReadCloser, int64, error) {
 		return t.DereferenceMedia(innerCtx, derefURI)
 	}
 
diff --git a/internal/federation/dereferencing/media.go b/internal/federation/dereferencing/media.go
index 1b99eaa96..afa184a98 100644
--- a/internal/federation/dereferencing/media.go
+++ b/internal/federation/dereferencing/media.go
@@ -42,7 +42,7 @@ func (d *deref) GetRemoteMedia(ctx context.Context, requestingUsername string, a
 		return nil, fmt.Errorf("GetRemoteMedia: error parsing url: %s", err)
 	}
 
-	dataFunc := func(innerCtx context.Context) (io.Reader, int64, error) {
+	dataFunc := func(innerCtx context.Context) (io.ReadCloser, int64, error) {
 		return t.DereferenceMedia(innerCtx, derefURI)
 	}
 
-- 
cgit v1.2.3