diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-08-20 12:26:56 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-08-20 12:26:56 +0200 |
| commit | 4920229a3b6e1d7dde536bc9ff766542b05d935c (patch) | |
| tree | a9423beccec5331c372f01eedf38949dfb171e9e /internal/processing/admin/createdomainblock.go | |
| parent | Text/status parsing fixes (#141) (diff) | |
| download | gotosocial-4920229a3b6e1d7dde536bc9ff766542b05d935c.tar.xz | |
Database updates (#144)
* start moving some database stuff around
* continue moving db stuff around
* more fiddling
* more updates
* and some more
* and yet more
* i broke SOMETHING but what, it's a mystery
* tidy up
* vendor ttlcache
* use ttlcache
* fix up some tests
* rename some stuff
* little reminder
* some more updates
Diffstat (limited to 'internal/processing/admin/createdomainblock.go')
| -rw-r--r-- | internal/processing/admin/createdomainblock.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/processing/admin/createdomainblock.go b/internal/processing/admin/createdomainblock.go index df02cef94..624f632dc 100644 --- a/internal/processing/admin/createdomainblock.go +++ b/internal/processing/admin/createdomainblock.go @@ -36,7 +36,7 @@ func (p *processor) DomainBlockCreate(account *gtsmodel.Account, domain string, domainBlock := >smodel.DomainBlock{} err := p.db.GetWhere([]db.Where{{Key: "domain", Value: domain, CaseInsensitive: true}}, domainBlock) if err != nil { - if _, ok := err.(db.ErrNoEntries); !ok { + if err != db.ErrNoEntries { // something went wrong in the DB return nil, gtserror.NewErrorInternalError(fmt.Errorf("DomainBlockCreate: db error checking for existence of domain block %s: %s", domain, err)) } @@ -60,7 +60,7 @@ func (p *processor) DomainBlockCreate(account *gtsmodel.Account, domain string, // put the new block in the database if err := p.db.Put(domainBlock); err != nil { - if _, ok := err.(db.ErrAlreadyExists); !ok { + if err != db.ErrNoEntries { // there's a real error creating the block return nil, gtserror.NewErrorInternalError(fmt.Errorf("DomainBlockCreate: db error putting new domain block %s: %s", domain, err)) } @@ -123,9 +123,9 @@ func (p *processor) initiateDomainBlockSideEffects(account *gtsmodel.Account, bl selectAccountsLoop: for { - accounts, err := p.db.GetAccountsForInstance(block.Domain, maxID, limit) + accounts, err := p.db.GetInstanceAccounts(block.Domain, maxID, limit) if err != nil { - if _, ok := err.(db.ErrNoEntries); ok { + if err == db.ErrNoEntries { // no accounts left for this instance so we're done l.Infof("domainBlockProcessSideEffects: done iterating through accounts for domain %s", block.Domain) break selectAccountsLoop |