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/processing/util.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/processing/util.go')
| -rw-r--r-- | internal/processing/util.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/internal/processing/util.go b/internal/processing/util.go index 1e86c8f76..27cb9fabe 100644 --- a/internal/processing/util.go +++ b/internal/processing/util.go @@ -25,7 +25,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" "github.com/superseriousbusiness/gotosocial/internal/transport" @@ -54,21 +53,24 @@ func GetParseMentionFunc(dbConn db.DB, federator federation.Federator) gtsmodel. mentionedAccount = localAccount } else { var requestingUsername string + if originAccount.Domain == "" { requestingUsername = originAccount.Username } - remoteAccount, err := federator.GetAccount(transport.WithFastfail(ctx), dereferencing.GetAccountParams{ - RequestingUsername: requestingUsername, - RemoteAccountUsername: username, - RemoteAccountHost: domain, - }) + + remoteAccount, err := federator.GetAccountByUsernameDomain( + transport.WithFastfail(ctx), + requestingUsername, + username, + domain, + false, + ) if err != nil { - return nil, fmt.Errorf("error dereferencing account: %s", err) + return nil, fmt.Errorf("parseMentionFunc: error fetching account: %s", err) } // we were able to resolve it! mentionedAccount = remoteAccount - } mentionID, err := id.NewRandomULID() |