diff options
| author | 2021-10-04 15:24:19 +0200 | |
|---|---|---|
| committer | 2021-10-04 15:24:19 +0200 | |
| commit | e04b187702acb0c9908237a35b3a9857e2167b3f (patch) | |
| tree | 29839b8d5bbc28d34aba759a48dd7b005f1444f5 /internal/federation/dereferencing | |
| parent | Follow request auto approval (#259) (diff) | |
| download | gotosocial-e04b187702acb0c9908237a35b3a9857e2167b3f.tar.xz | |
Refactor/tidy (#261)
* tidy up streaming
* cut down code duplication
* test get followers/following
* test streaming processor
* fix some test models
* add TimeMustParse
* fix uri / url typo
* make trace logging less verbose
* make logging more consistent
* disable quote on logging
* remove context.Background
* remove many extraneous mastodon references
* regenerate swagger
* don't log query on no rows result
* log latency first for easier reading
Diffstat (limited to 'internal/federation/dereferencing')
| -rw-r--r-- | internal/federation/dereferencing/account.go | 4 | ||||
| -rw-r--r-- | internal/federation/dereferencing/collectionpage.go | 4 | ||||
| -rw-r--r-- | internal/federation/dereferencing/instance.go | 2 | ||||
| -rw-r--r-- | internal/federation/dereferencing/status.go | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index 35ea2507d..6acb3b06d 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -149,7 +149,7 @@ func (d *deref) dereferenceAccountable(ctx context.Context, username string, rem return nil, fmt.Errorf("DereferenceAccountable: transport err: %s", err) } - b, err := transport.Dereference(context.Background(), remoteAccountID) + b, err := transport.Dereference(ctx, remoteAccountID) if err != nil { return nil, fmt.Errorf("DereferenceAccountable: error deferencing %s: %s", remoteAccountID.String(), err) } @@ -159,7 +159,7 @@ func (d *deref) dereferenceAccountable(ctx context.Context, username string, rem return nil, fmt.Errorf("DereferenceAccountable: error unmarshalling bytes into json: %s", err) } - t, err := streams.ToType(context.Background(), m) + t, err := streams.ToType(ctx, m) if err != nil { return nil, fmt.Errorf("DereferenceAccountable: error resolving json into ap vocab type: %s", err) } diff --git a/internal/federation/dereferencing/collectionpage.go b/internal/federation/dereferencing/collectionpage.go index c5a54402c..cf97327a5 100644 --- a/internal/federation/dereferencing/collectionpage.go +++ b/internal/federation/dereferencing/collectionpage.go @@ -41,7 +41,7 @@ func (d *deref) DereferenceCollectionPage(ctx context.Context, username string, return nil, fmt.Errorf("DereferenceCollectionPage: error creating transport: %s", err) } - b, err := transport.Dereference(context.Background(), pageIRI) + b, err := transport.Dereference(ctx, pageIRI) if err != nil { return nil, fmt.Errorf("DereferenceCollectionPage: error deferencing %s: %s", pageIRI.String(), err) } @@ -51,7 +51,7 @@ func (d *deref) DereferenceCollectionPage(ctx context.Context, username string, return nil, fmt.Errorf("DereferenceCollectionPage: error unmarshalling bytes into json: %s", err) } - t, err := streams.ToType(context.Background(), m) + t, err := streams.ToType(ctx, m) if err != nil { return nil, fmt.Errorf("DereferenceCollectionPage: error resolving json into ap vocab type: %s", err) } diff --git a/internal/federation/dereferencing/instance.go b/internal/federation/dereferencing/instance.go index ec3c3f13d..775475749 100644 --- a/internal/federation/dereferencing/instance.go +++ b/internal/federation/dereferencing/instance.go @@ -36,5 +36,5 @@ func (d *deref) GetRemoteInstance(ctx context.Context, username string, remoteIn return nil, fmt.Errorf("transport err: %s", err) } - return transport.DereferenceInstance(context.Background(), remoteInstanceURI) + return transport.DereferenceInstance(ctx, remoteInstanceURI) } diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go index edf1f0e41..435bc9217 100644 --- a/internal/federation/dereferencing/status.go +++ b/internal/federation/dereferencing/status.go @@ -137,7 +137,7 @@ func (d *deref) dereferenceStatusable(ctx context.Context, username string, remo return nil, fmt.Errorf("DereferenceStatusable: transport err: %s", err) } - b, err := transport.Dereference(context.Background(), remoteStatusID) + b, err := transport.Dereference(ctx, remoteStatusID) if err != nil { return nil, fmt.Errorf("DereferenceStatusable: error deferencing %s: %s", remoteStatusID.String(), err) } @@ -147,7 +147,7 @@ func (d *deref) dereferenceStatusable(ctx context.Context, username string, remo return nil, fmt.Errorf("DereferenceStatusable: error unmarshalling bytes into json: %s", err) } - t, err := streams.ToType(context.Background(), m) + t, err := streams.ToType(ctx, m) if err != nil { return nil, fmt.Errorf("DereferenceStatusable: error resolving json into ap vocab type: %s", err) } |
