From 33aee1b1e974e99182a95ce1a05e2be924d19bb2 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 3 Feb 2023 20:03:05 +0000 Subject: [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 Co-authored-by: tsmethurst --- internal/federation/gone.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'internal/federation/gone.go') diff --git a/internal/federation/gone.go b/internal/federation/gone.go index 3d9fe3b84..e6d784181 100644 --- a/internal/federation/gone.go +++ b/internal/federation/gone.go @@ -2,12 +2,10 @@ package federation import ( "context" - "fmt" "net/url" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // CheckGone checks if a tombstone exists in the database for AP Actor or Object with the given uri. @@ -17,18 +15,10 @@ func (f *federator) CheckGone(ctx context.Context, uri *url.URL) (bool, error) { // HandleGone puts a tombstone in the database, which marks an AP Actor or Object with the given uri as gone. func (f *federator) HandleGone(ctx context.Context, uri *url.URL) error { - tombstoneID, err := id.NewULID() - if err != nil { - err = fmt.Errorf("HandleGone: error generating id for new tombstone %s: %s", uri, err) - log.Error(err) - return err - } - tombstone := >smodel.Tombstone{ - ID: tombstoneID, + ID: id.NewULID(), Domain: uri.Host, URI: uri.String(), } - return f.db.PutTombstone(ctx, tombstone) } -- cgit v1.2.3