diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-02-03 20:03:05 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-03 20:03:05 +0000 |
| commit | 33aee1b1e974e99182a95ce1a05e2be924d19bb2 (patch) | |
| tree | 1471623039f70325a0b7a1c25dd4fe3afc883970 /internal/federation/federator.go | |
| parent | [feature/frogend] (Mastodon) domain block CSV import (#1390) (diff) | |
| download | gotosocial-33aee1b1e974e99182a95ce1a05e2be924d19bb2.tar.xz | |
[chore] reformat GetAccount() functionality, support updating accounts based on last_fetch (#1411)
* reformat GetAccount() functionality, and add UpdateAccount() function.
* use fetched_at instead of last_webfingered_at
* catch local "not found" errors. small formatting / error string changes
* remove now unused error type
* return nil when wrapping nil error
* update expected error messages
* return correct url for foss satan webfinger
* add AP model for Some_User
* normalize local domain
* return notretrievable where appropriate
* expose NewErrNotRetrievable
* ensure webfinger for new accounts searched by uri
* update local account short circuit
* allow enrich to fail for already-known accounts
* remove unused LastWebfingeredAt
* expose test maps on mock http client
* update Update test
* reformat GetAccount() functionality, and add UpdateAccount() function.
* use fetched_at instead of last_webfingered_at
* catch local "not found" errors. small formatting / error string changes
* remove nil error checks (we shouldn't be passing nil errors to newError() initializers)
* remove mutex unlock on transport init fail (it hasn't yet been locked!)
* woops add back the error wrapping to use ErrNotRetrievable
* caches were never being started... :see_no_evil:
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/federation/federator.go')
| -rw-r--r-- | internal/federation/federator.go | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/internal/federation/federator.go b/internal/federation/federator.go index 0ba370cc4..5aa44742d 100644 --- a/internal/federation/federator.go +++ b/internal/federation/federator.go @@ -23,12 +23,10 @@ import ( "net/url" "github.com/superseriousbusiness/activity/pub" - "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" "github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" @@ -53,20 +51,9 @@ type Federator interface { // If something goes wrong during authentication, nil, false, and an error will be returned. AuthenticateFederatedRequest(ctx context.Context, username string) (*url.URL, gtserror.WithCode) - /* - dereferencing functions - */ - DereferenceRemoteThread(ctx context.Context, username string, statusURI *url.URL, status *gtsmodel.Status, statusable ap.Statusable) - DereferenceAnnounce(ctx context.Context, announce *gtsmodel.Status, requestingUsername string) error - GetAccount(ctx context.Context, params dereferencing.GetAccountParams) (*gtsmodel.Account, error) - GetStatus(ctx context.Context, username string, remoteStatusID *url.URL, refetch, includeParent bool) (*gtsmodel.Status, ap.Statusable, error) - EnrichRemoteStatus(ctx context.Context, username string, status *gtsmodel.Status, includeParent bool) (*gtsmodel.Status, error) - GetRemoteInstance(ctx context.Context, username string, remoteInstanceURI *url.URL) (*gtsmodel.Instance, error) - - // Handshaking returns true if the given username is currently in the process of dereferencing the remoteAccountID. - Handshaking(ctx context.Context, username string, remoteAccountID *url.URL) bool pub.CommonBehavior pub.FederatingProtocol + dereferencing.Dereferencer } type federator struct { @@ -75,9 +62,9 @@ type federator struct { clock pub.Clock typeConverter typeutils.TypeConverter transportController transport.Controller - dereferencer dereferencing.Dereferencer mediaManager media.Manager actor pub.FederatingActor + dereferencing.Dereferencer } // NewFederator returns a new federator @@ -91,8 +78,8 @@ func NewFederator(db db.DB, federatingDB federatingdb.DB, transportController tr clock: &Clock{}, typeConverter: typeConverter, transportController: transportController, - dereferencer: dereferencer, mediaManager: mediaManager, + Dereferencer: dereferencer, } actor := newFederatingActor(f, f, federatingDB, clock) f.actor = actor |