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/admin | |
| 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/admin')
| -rw-r--r-- | internal/processing/admin/accountaction.go | 7 | ||||
| -rw-r--r-- | internal/processing/admin/createdomainblock.go | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/internal/processing/admin/accountaction.go b/internal/processing/admin/accountaction.go index c71eb27e5..e4e6bbd97 100644 --- a/internal/processing/admin/accountaction.go +++ b/internal/processing/admin/accountaction.go @@ -18,13 +18,8 @@ func (p *processor) AccountAction(ctx context.Context, account *gtsmodel.Account return gtserror.NewErrorInternalError(err) } - adminActionID, err := id.NewULID() - if err != nil { - return gtserror.NewErrorInternalError(err) - } - adminAction := >smodel.AdminAccountAction{ - ID: adminActionID, + ID: id.NewULID(), AccountID: account.ID, TargetAccountID: targetAccount.ID, Text: form.Text, diff --git a/internal/processing/admin/createdomainblock.go b/internal/processing/admin/createdomainblock.go index 98ba9cf1b..1c80ee78f 100644 --- a/internal/processing/admin/createdomainblock.go +++ b/internal/processing/admin/createdomainblock.go @@ -50,14 +50,8 @@ func (p *processor) DomainBlockCreate(ctx context.Context, account *gtsmodel.Acc } // there's no block for this domain yet so create one - // note: we take a new ulid from timestamp here in case we need to sort blocks - blockID, err := id.NewULID() - if err != nil { - return nil, gtserror.NewErrorInternalError(fmt.Errorf("error creating id for new domain block %s: %s", domain, err)) - } - newBlock := >smodel.DomainBlock{ - ID: blockID, + ID: id.NewULID(), Domain: domain, CreatedByAccountID: account.ID, PrivateComment: text.SanitizePlaintext(privateComment), |