summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-07-08 23:12:06 +0200
committerLibravatar GitHub <noreply@github.com>2023-07-08 23:12:06 +0200
commit6dbb8ba7aaa91bd865a408d8a9a87c70ad0bac84 (patch)
tree4186c3b60ffe5694a7cf4683f99ef7b0b8168f66 /internal/processing
parent[bugfix] Delete mutual follow (requests) when receiving block from remote (#1... (diff)
downloadgotosocial-6dbb8ba7aaa91bd865a408d8a9a87c70ad0bac84.tar.xz
[bugfix] Fix delete follow req instead of follow (#1962)
Diffstat (limited to 'internal/processing')
-rw-r--r--internal/processing/fromfederator.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go
index 7152393db..52b12126c 100644
--- a/internal/processing/fromfederator.go
+++ b/internal/processing/fromfederator.go
@@ -376,14 +376,14 @@ func (p *Processor) processCreateBlockFromFederator(ctx context.Context, federat
}
// Remove any follows that existed between blocker + blockee.
- if err := p.state.DB.DeleteFollowRequest(ctx, block.AccountID, block.TargetAccountID); err != nil {
+ if err := p.state.DB.DeleteFollow(ctx, block.AccountID, block.TargetAccountID); err != nil {
return gtserror.Newf(
"db error deleting follow from %s targeting %s: %w",
block.AccountID, block.TargetAccountID, err,
)
}
- if err := p.state.DB.DeleteFollowRequest(ctx, block.TargetAccountID, block.AccountID); err != nil {
+ if err := p.state.DB.DeleteFollow(ctx, block.TargetAccountID, block.AccountID); err != nil {
return gtserror.Newf(
"db error deleting follow from %s targeting %s: %w",
block.TargetAccountID, block.AccountID, err,