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/dereferencing/handshake.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'internal/federation/dereferencing/handshake.go') diff --git a/internal/federation/dereferencing/handshake.go b/internal/federation/dereferencing/handshake.go index 8533f3387..2b67e86bf 100644 --- a/internal/federation/dereferencing/handshake.go +++ b/internal/federation/dereferencing/handshake.go @@ -19,11 +19,10 @@ package dereferencing import ( - "context" "net/url" ) -func (d *deref) Handshaking(ctx context.Context, username string, remoteAccountID *url.URL) bool { +func (d *deref) Handshaking(username string, remoteAccountID *url.URL) bool { d.handshakeSync.Lock() defer d.handshakeSync.Unlock() @@ -53,11 +52,6 @@ func (d *deref) startHandshake(username string, remoteAccountID *url.URL) { d.handshakeSync.Lock() defer d.handshakeSync.Unlock() - // lazily initialize handshakes - if d.handshakes == nil { - d.handshakes = make(map[string][]*url.URL) - } - remoteIDs, ok := d.handshakes[username] if !ok { // there was nothing in there yet, so just add this entry and return @@ -74,13 +68,8 @@ func (d *deref) stopHandshake(username string, remoteAccountID *url.URL) { d.handshakeSync.Lock() defer d.handshakeSync.Unlock() - if d.handshakes == nil { - return - } - remoteIDs, ok := d.handshakes[username] if !ok { - // there was nothing in there yet anyway so just bail return } -- cgit v1.2.3