diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-10-04 15:24:19 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-04 15:24:19 +0200 |
| commit | e04b187702acb0c9908237a35b3a9857e2167b3f (patch) | |
| tree | 29839b8d5bbc28d34aba759a48dd7b005f1444f5 /internal/processing/followrequest.go | |
| 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/processing/followrequest.go')
| -rw-r--r-- | internal/processing/followrequest.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/processing/followrequest.go b/internal/processing/followrequest.go index b313e42f8..74bffd693 100644 --- a/internal/processing/followrequest.go +++ b/internal/processing/followrequest.go @@ -47,11 +47,11 @@ func (p *processor) FollowRequestsGet(ctx context.Context, auth *oauth.Auth) ([] fr.Account = frAcct } - mastoAcct, err := p.tc.AccountToMastoPublic(ctx, fr.Account) + apiAcct, err := p.tc.AccountToAPIAccountPublic(ctx, fr.Account) if err != nil { return nil, gtserror.NewErrorInternalError(err) } - accts = append(accts, *mastoAcct) + accts = append(accts, *apiAcct) } return accts, nil } @@ -91,7 +91,7 @@ func (p *processor) FollowRequestAccept(ctx context.Context, auth *oauth.Auth, a return nil, gtserror.NewErrorInternalError(err) } - r, err := p.tc.RelationshipToMasto(ctx, gtsR) + r, err := p.tc.RelationshipToAPIRelationship(ctx, gtsR) if err != nil { return nil, gtserror.NewErrorInternalError(err) } |