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/processing/fromcommon.go | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) (limited to 'internal/processing/fromcommon.go') diff --git a/internal/processing/fromcommon.go b/internal/processing/fromcommon.go index 9f0512941..1c6176565 100644 --- a/internal/processing/fromcommon.go +++ b/internal/processing/fromcommon.go @@ -76,13 +76,8 @@ func (p *processor) notifyStatus(ctx context.Context, status *gtsmodel.Status) e } // if we've reached this point we know the mention is for a local account, and the notification doesn't exist, so create it - notifID, err := id.NewULID() - if err != nil { - return err - } - notif := >smodel.Notification{ - ID: notifID, + ID: id.NewULID(), NotificationType: gtsmodel.NotificationMention, TargetAccountID: m.TargetAccountID, TargetAccount: m.TargetAccount, @@ -127,13 +122,8 @@ func (p *processor) notifyFollowRequest(ctx context.Context, followRequest *gtsm return nil } - notifID, err := id.NewULID() - if err != nil { - return err - } - notif := >smodel.Notification{ - ID: notifID, + ID: id.NewULID(), NotificationType: gtsmodel.NotificationFollowRequest, TargetAccountID: followRequest.TargetAccountID, OriginAccountID: followRequest.AccountID, @@ -172,13 +162,8 @@ func (p *processor) notifyFollow(ctx context.Context, follow *gtsmodel.Follow, t } // now create the new follow notification - notifID, err := id.NewULID() - if err != nil { - return err - } - notif := >smodel.Notification{ - ID: notifID, + ID: id.NewULID(), NotificationType: gtsmodel.NotificationFollow, TargetAccountID: follow.TargetAccountID, TargetAccount: follow.TargetAccount, @@ -222,13 +207,8 @@ func (p *processor) notifyFave(ctx context.Context, fave *gtsmodel.StatusFave) e return nil } - notifID, err := id.NewULID() - if err != nil { - return err - } - notif := >smodel.Notification{ - ID: notifID, + ID: id.NewULID(), NotificationType: gtsmodel.NotificationFave, TargetAccountID: fave.TargetAccountID, TargetAccount: fave.TargetAccount, @@ -301,13 +281,8 @@ func (p *processor) notifyAnnounce(ctx context.Context, status *gtsmodel.Status) } // now create the new reblog notification - notifID, err := id.NewULID() - if err != nil { - return err - } - notif := >smodel.Notification{ - ID: notifID, + ID: id.NewULID(), NotificationType: gtsmodel.NotificationReblog, TargetAccountID: status.BoostOfAccountID, TargetAccount: status.BoostOfAccount, -- cgit v1.2.3