diff options
| author |  Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> | 2021-08-10 13:32:39 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-08-10 13:32:39 +0200 |
| commit | 0f2de6394a1c52d47e326bb7d7d129a217ae4f6f (patch) | |
| tree | e2709bdbbbbcf5e12d6da62b653b67f1789ab1c5 /internal/processing/account | |
| parent | Frodo swaggins (#126) (diff) | |
| download | gotosocial-0f2de6394a1c52d47e326bb7d7d129a217ae4f6f.tar.xz | |
Dereference remote replies (#132)
* decided where to put reply dereferencing
* fiddling with dereferencing threads
* further adventures
* tidy up some stuff
* move dereferencing functionality
* a bunch of refactoring
* go fmt
* more refactoring
* bleep bloop
* docs and linting
* start implementing replies collection on gts side
* fiddling around
* allow dereferencing our replies
* lint, fmt
Diffstat (limited to 'internal/processing/account')
| -rw-r--r-- | internal/processing/account/get.go | 9 | ||||
| -rw-r--r-- | internal/processing/account/getfollowers.go | 6 | ||||
| -rw-r--r-- | internal/processing/account/getfollowing.go | 6 |
3 files changed, 0 insertions, 21 deletions
diff --git a/internal/processing/account/get.go b/internal/processing/account/get.go index b937ace5b..d2994e246 100644 --- a/internal/processing/account/get.go +++ b/internal/processing/account/get.go @@ -36,15 +36,6 @@ func (p *processor) Get(requestingAccount *gtsmodel.Account, targetAccountID str return nil, fmt.Errorf("db error: %s", err) } - // lazily dereference things on the account if it hasn't been done yet - var requestingUsername string - if requestingAccount != nil { - requestingUsername = requestingAccount.Username - } - if err := p.federator.DereferenceAccountFields(targetAccount, requestingUsername, false); err != nil { - p.log.WithField("func", "AccountGet").Debugf("dereferencing account: %s", err) - } - var blocked bool var err error if requestingAccount != nil { diff --git a/internal/processing/account/getfollowers.go b/internal/processing/account/getfollowers.go index bfc463d3f..0806a82c0 100644 --- a/internal/processing/account/getfollowers.go +++ b/internal/processing/account/getfollowers.go @@ -63,12 +63,6 @@ func (p *processor) FollowersGet(requestingAccount *gtsmodel.Account, targetAcco return nil, gtserror.NewErrorInternalError(err) } - // derefence account fields in case we haven't done it already - if err := p.federator.DereferenceAccountFields(a, requestingAccount.Username, false); err != nil { - // don't bail if we can't fetch them, we'll try another time - p.log.WithField("func", "AccountFollowersGet").Debugf("error dereferencing account fields: %s", err) - } - account, err := p.tc.AccountToMastoPublic(a) if err != nil { return nil, gtserror.NewErrorInternalError(err) diff --git a/internal/processing/account/getfollowing.go b/internal/processing/account/getfollowing.go index bb6a905f4..75e89dacb 100644 --- a/internal/processing/account/getfollowing.go +++ b/internal/processing/account/getfollowing.go @@ -63,12 +63,6 @@ func (p *processor) FollowingGet(requestingAccount *gtsmodel.Account, targetAcco return nil, gtserror.NewErrorInternalError(err) } - // derefence account fields in case we haven't done it already - if err := p.federator.DereferenceAccountFields(a, requestingAccount.Username, false); err != nil { - // don't bail if we can't fetch them, we'll try another time - p.log.WithField("func", "AccountFollowingGet").Debugf("error dereferencing account fields: %s", err) - } - account, err := p.tc.AccountToMastoPublic(a) if err != nil { return nil, gtserror.NewErrorInternalError(err) |