diff options
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), |