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/account/removefollow.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/account/removefollow.go')
| -rw-r--r-- | internal/processing/account/removefollow.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/processing/account/removefollow.go b/internal/processing/account/removefollow.go index ef8994893..6646d694e 100644 --- a/internal/processing/account/removefollow.go +++ b/internal/processing/account/removefollow.go @@ -29,7 +29,7 @@ import ( func (p *processor) FollowRemove(requestingAccount *gtsmodel.Account, targetAccountID string) (*apimodel.Relationship, gtserror.WithCode) { // if there's a block between the accounts we shouldn't do anything - blocked, err := p.db.Blocked(requestingAccount.ID, targetAccountID) + blocked, err := p.db.IsBlocked(requestingAccount.ID, targetAccountID, true) if err != nil { return nil, gtserror.NewErrorInternalError(err) } @@ -40,7 +40,7 @@ func (p *processor) FollowRemove(requestingAccount *gtsmodel.Account, targetAcco // make sure the target account actually exists in our db targetAcct := >smodel.Account{} if err := p.db.GetByID(targetAccountID, targetAcct); err != nil { - if _, ok := err.(db.ErrNoEntries); ok { + if err == db.ErrNoEntries { return nil, gtserror.NewErrorNotFound(fmt.Errorf("AccountFollowRemove: account %s not found in the db: %s", targetAccountID, err)) } } |