diff options
author | 2023-02-03 20:03:05 +0000 | |
---|---|---|
committer | 2023-02-03 20:03:05 +0000 | |
commit | 33aee1b1e974e99182a95ce1a05e2be924d19bb2 (patch) | |
tree | 1471623039f70325a0b7a1c25dd4fe3afc883970 /internal/federation/dereferencing/error.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/federation/dereferencing/error.go')
-rw-r--r-- | internal/federation/dereferencing/error.go | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/internal/federation/dereferencing/error.go b/internal/federation/dereferencing/error.go index 48804b50d..3ba357f7a 100644 --- a/internal/federation/dereferencing/error.go +++ b/internal/federation/dereferencing/error.go @@ -49,24 +49,10 @@ func (err *ErrNotRetrievable) Error() string { return fmt.Sprintf("item could not be retrieved: %v", err.wrapped) } -func newErrNotRetrievable(err error) error { +func NewErrNotRetrievable(err error) error { return &ErrNotRetrievable{wrapped: err} } -// ErrBadRequest denotes that insufficient or improperly formed parameters -// were passed into one of the dereference functions. -type ErrBadRequest struct { - wrapped error -} - -func (err *ErrBadRequest) Error() string { - return fmt.Sprintf("bad request: %v", err.wrapped) -} - -func newErrBadRequest(err error) error { - return &ErrBadRequest{wrapped: err} -} - // ErrTransportError indicates that something unforeseen went wrong creating // a transport, or while making an http call to a remote resource with a transport. type ErrTransportError struct { @@ -121,7 +107,7 @@ func wrapDerefError(derefErr error, fluff string) error { switch { case errors.Is(derefErr, transport.ErrGone): - err = newErrNotRetrievable(err) + err = NewErrNotRetrievable(err) case errors.As(derefErr, &errWrongType): err = newErrWrongType(err) default: |