diff options
author | 2024-03-12 15:34:08 +0100 | |
---|---|---|
committer | 2024-03-12 14:34:08 +0000 | |
commit | 1bcdf1da3bb10d564a6a56a89af5afa53e5cd78f (patch) | |
tree | 83716cea30d236c48e1655193c3adfc232e5bc75 /internal/federation/dereferencing | |
parent | [chore] Update usage of OTEL libraries (#2725) (diff) | |
download | gotosocial-1bcdf1da3bb10d564a6a56a89af5afa53e5cd78f.tar.xz |
[feature] Process incoming `Move` activity (#2724)
* [feature] Process incoming account Move activity
* fix targetAcct typo
* put move origin account on fMsg
* shift more move functionality back to the worker fn
* simplify error logic
Diffstat (limited to 'internal/federation/dereferencing')
-rw-r--r-- | internal/federation/dereferencing/account.go | 9 | ||||
-rw-r--r-- | internal/federation/dereferencing/dereferencer.go | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index 10d15bca6..5e81fb445 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -64,8 +64,8 @@ func accountFresh( return true } - if !account.SuspendedAt.IsZero() { - // Can't refresh + if account.IsSuspended() { + // Can't/won't refresh // suspended accounts. return true } @@ -388,8 +388,9 @@ func (d *Dereferencer) enrichAccountSafely( account *gtsmodel.Account, accountable ap.Accountable, ) (*gtsmodel.Account, ap.Accountable, error) { - // Noop if account has been suspended. - if !account.SuspendedAt.IsZero() { + // Noop if account suspended; + // we don't want to deref it. + if account.IsSuspended() { return account, nil, nil } diff --git a/internal/federation/dereferencing/dereferencer.go b/internal/federation/dereferencing/dereferencer.go index 24e579408..3fa199345 100644 --- a/internal/federation/dereferencing/dereferencer.go +++ b/internal/federation/dereferencing/dereferencer.go @@ -64,6 +64,16 @@ var ( // This is tuned to be quite fresh without // causing loads of dereferencing calls. Fresh = util.Ptr(FreshnessWindow(5 * time.Minute)) + + // 10 seconds. + // + // Freshest is useful when you want an + // immediately up to date model of something + // that's even fresher than Fresh. + // + // Be careful using this one; it can cause + // lots of unnecessary traffic if used unwisely. + Freshest = util.Ptr(FreshnessWindow(10 * time.Second)) ) // Dereferencer wraps logic and functionality for doing dereferencing |