Merge pull request #361 from superseriousbusiness/media_refactorv0.2.0

Refactor media handler to allow async media resolution

2 files changed, 12 insertions, 15 deletions

diff --git a/internal/transport/derefmedia.go b/internal/transport/derefmedia.go
index 8a6aa4e24..e3c86ce1e 100644
--- a/internal/transport/derefmedia.go
+++ b/internal/transport/derefmedia.go
@@ -21,25 +21,22 @@ package transport
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 
 	"github.com/sirupsen/logrus"
 )
 
-func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL, expectedContentType string) ([]byte, error) {
+func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL) (io.ReadCloser, int, error) {
 	l := logrus.WithField("func", "DereferenceMedia")
 	l.Debugf("performing GET to %s", iri.String())
 	req, err := http.NewRequestWithContext(ctx, "GET", iri.String(), nil)
 	if err != nil {
-		return nil, err
-	}
-	if expectedContentType == "" {
-		req.Header.Add("Accept", "*/*")
-	} else {
-		req.Header.Add("Accept", expectedContentType)
+		return nil, 0, err
 	}
+
+	req.Header.Add("Accept", "*/*") // we don't know what kind of media we're going to get here
 	req.Header.Add("Date", t.clock.Now().UTC().Format("Mon, 02 Jan 2006 15:04:05")+" GMT")
 	req.Header.Add("User-Agent", fmt.Sprintf("%s %s", t.appAgent, t.gofedAgent))
 	req.Header.Set("Host", iri.Host)
@@ -47,15 +44,14 @@ func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL, expected
 	err = t.getSigner.SignRequest(t.privkey, t.pubKeyID, req, nil)
 	t.getSignerMu.Unlock()
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 	resp, err := t.client.Do(req)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
-	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("GET request to %s failed (%d): %s", iri.String(), resp.StatusCode, resp.Status)
+		return nil, 0, fmt.Errorf("GET request to %s failed (%d): %s", iri.String(), resp.StatusCode, resp.Status)
 	}
-	return ioutil.ReadAll(resp.Body)
+	return resp.Body, int(resp.ContentLength), nil
 }
diff --git a/internal/transport/transport.go b/internal/transport/transport.go
index 73b015865..9e8cd8213 100644
--- a/internal/transport/transport.go
+++ b/internal/transport/transport.go
@@ -21,6 +21,7 @@ package transport
 import (
 	"context"
 	"crypto"
+	"io"
 	"net/url"
 	"sync"
 
@@ -33,8 +34,8 @@ import (
 // functionality for fetching remote media.
 type Transport interface {
 	pub.Transport
-	// DereferenceMedia fetches the bytes of the given media attachment IRI, with the expectedContentType.
-	DereferenceMedia(ctx context.Context, iri *url.URL, expectedContentType string) ([]byte, error)
+	// DereferenceMedia fetches the given media attachment IRI, returning the reader and filesize.
+	DereferenceMedia(ctx context.Context, iri *url.URL) (io.ReadCloser, int, error)
 	// DereferenceInstance dereferences remote instance information, first by checking /api/v1/instance, and then by checking /.well-known/nodeinfo.
 	DereferenceInstance(ctx context.Context, iri *url.URL) (*gtsmodel.Instance, error)
 	// Finger performs a webfinger request with the given username and domain, and returns the bytes from the response body.