summaryrefslogtreecommitdiff
path: root/internal/transport
diff options
context:
space:
mode:
Diffstat (limited to 'internal/transport')
-rw-r--r--internal/transport/deliver.go2
-rw-r--r--internal/transport/dereference.go2
-rw-r--r--internal/transport/derefinstance.go6
-rw-r--r--internal/transport/derefmedia.go2
-rw-r--r--internal/transport/finger.go2
-rw-r--r--internal/transport/transport_test.go2
6 files changed, 8 insertions, 8 deletions
diff --git a/internal/transport/deliver.go b/internal/transport/deliver.go
index 054baa6a5..e2dbc4829 100644
--- a/internal/transport/deliver.go
+++ b/internal/transport/deliver.go
@@ -130,7 +130,7 @@ func (t *transport) deliver(ctx context.Context, b []byte, to *url.URL) error {
if code := rsp.StatusCode; code != http.StatusOK &&
code != http.StatusCreated && code != http.StatusAccepted {
- return gtserror.NewResponseError(rsp)
+ return gtserror.NewFromResponse(rsp)
}
return nil
diff --git a/internal/transport/dereference.go b/internal/transport/dereference.go
index e231e0954..e1702f9f4 100644
--- a/internal/transport/dereference.go
+++ b/internal/transport/dereference.go
@@ -65,7 +65,7 @@ func (t *transport) Dereference(ctx context.Context, iri *url.URL) ([]byte, erro
defer rsp.Body.Close()
if rsp.StatusCode != http.StatusOK {
- return nil, gtserror.NewResponseError(rsp)
+ return nil, gtserror.NewFromResponse(rsp)
}
return io.ReadAll(rsp.Body)
diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go
index c373a140a..c6572b727 100644
--- a/internal/transport/derefinstance.go
+++ b/internal/transport/derefinstance.go
@@ -102,7 +102,7 @@ func dereferenceByAPIV1Instance(ctx context.Context, t *transport, iri *url.URL)
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
- return nil, gtserror.NewResponseError(resp)
+ return nil, gtserror.NewFromResponse(resp)
}
b, err := io.ReadAll(resp.Body)
@@ -252,7 +252,7 @@ func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*ur
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
- return nil, gtserror.NewResponseError(resp)
+ return nil, gtserror.NewFromResponse(resp)
}
b, err := io.ReadAll(resp.Body)
@@ -303,7 +303,7 @@ func callNodeInfo(ctx context.Context, t *transport, iri *url.URL) (*apimodel.No
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
- return nil, gtserror.NewResponseError(resp)
+ return nil, gtserror.NewFromResponse(resp)
}
b, err := io.ReadAll(resp.Body)
diff --git a/internal/transport/derefmedia.go b/internal/transport/derefmedia.go
index ad47d99b5..76dfd37ea 100644
--- a/internal/transport/derefmedia.go
+++ b/internal/transport/derefmedia.go
@@ -46,7 +46,7 @@ func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL) (io.Read
// Check for an expected status code
if rsp.StatusCode != http.StatusOK {
- return nil, 0, gtserror.NewResponseError(rsp)
+ return nil, 0, gtserror.NewFromResponse(rsp)
}
return rsp.Body, rsp.ContentLength, nil
diff --git a/internal/transport/finger.go b/internal/transport/finger.go
index e6086747b..49648c7e9 100644
--- a/internal/transport/finger.go
+++ b/internal/transport/finger.go
@@ -156,7 +156,7 @@ func (t *transport) Finger(ctx context.Context, targetUsername string, targetDom
}
// We've reached the end of the line here, both the original request
// and our attempt to resolve it through the fallback have failed
- return nil, gtserror.NewResponseError(rsp)
+ return nil, gtserror.NewFromResponse(rsp)
}
// Set the URL in cache here, since host-meta told us this should be the
diff --git a/internal/transport/transport_test.go b/internal/transport/transport_test.go
index 297abd73e..ab9b6a21a 100644
--- a/internal/transport/transport_test.go
+++ b/internal/transport/transport_test.go
@@ -39,7 +39,7 @@ type TransportTestSuite struct {
suite.Suite
db db.DB
storage *storage.Driver
- mediaManager media.Manager
+ mediaManager *media.Manager
federator federation.Federator
processor *processing.Processor
emailSender email.Sender