diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-05-28 13:08:35 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-05-28 14:08:35 +0200 |
| commit | 5faeb4de2032e112ab49751eeeb906ac43826f3d (patch) | |
| tree | ea94b86f27384954ff93aec864b13b83c7f46db0 /internal/transport | |
| parent | [docs] Update + simplify roadmap, revise beta estimate (#1826) (diff) | |
| download | gotosocial-5faeb4de2032e112ab49751eeeb906ac43826f3d.tar.xz | |
[chore] tidy up media manager, add calling func to errors, build-script improvements (#1835)
* media manager tidy-up: de-interface and remove unused PostDataFunc
Signed-off-by: kim <grufwub@gmail.com>
* remove last traces of media.Manager being an interface
Signed-off-by: kim <grufwub@gmail.com>
* update error to provide caller, allow tuneable via build tags
Signed-off-by: kim <grufwub@gmail.com>
* remove kim-specific build script changes
Signed-off-by: kim <grufwub@gmail.com>
* fix merge conflicts
Signed-off-by: kim <grufwub@gmail.com>
* update build-script to support externally setting build variables
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/transport')
| -rw-r--r-- | internal/transport/deliver.go | 2 | ||||
| -rw-r--r-- | internal/transport/dereference.go | 2 | ||||
| -rw-r--r-- | internal/transport/derefinstance.go | 6 | ||||
| -rw-r--r-- | internal/transport/derefmedia.go | 2 | ||||
| -rw-r--r-- | internal/transport/finger.go | 2 | ||||
| -rw-r--r-- | internal/transport/transport_test.go | 2 |
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 |