diff options
| author | Starfall <us@starfall.systems> | 2021-01-26 16:42:38 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-01-26 16:42:38 -0600 |
| commit | 3ef928029d94a2b3c6abf96a2935de85c4eed6c8 (patch) | |
| tree | d8697b527a0a42e51634b1fef68f0162fe2ccbe2 /app/lib/activitypub | |
| parent | 65263e6309fb4dea1a93d4b4806af629d317c156 (diff) | |
| parent | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (diff) | |
Merge remote-tracking branch 'glitchsoc/main' into main
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity/block.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb index 90477bf33..92a0f813f 100644 --- a/app/lib/activitypub/activity/block.rb +++ b/app/lib/activitypub/activity/block.rb @@ -11,8 +11,13 @@ class ActivityPub::Activity::Block < ActivityPub::Activity return end + UnfollowService.new.call(@account, target_account) if @account.following?(target_account) UnfollowService.new.call(target_account, @account) if target_account.following?(@account) + RejectFollowService.new.call(target_account, @account) if target_account.requested?(@account) - @account.block!(target_account, uri: @json['id']) unless delete_arrived_first?(@json['id']) + unless delete_arrived_first?(@json['id']) + BlockWorker.perform_async(@account.id, target_account.id) + @account.block!(target_account, uri: @json['id']) + end end end |