about summary refs log tree commit diff
path: root/app/services/block_service.rb
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-08-17 14:21:12 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:18 -0500
commitcfaec2ad7811094a612aa05a272181eccab334fd (patch)
treefe2a46107ab3964a66a14b29f8b7e89edaf9b5cb /app/services/block_service.rb
parentfd3895b6119b54c0365294653e555fff9d11ba46 (diff)
[Federation] Add worker for softblocks
Diffstat (limited to 'app/services/block_service.rb')
-rw-r--r--app/services/block_service.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 266a0f4b9..0b8ecd3e0 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -3,16 +3,16 @@
 class BlockService < BaseService
   include Payloadable
 
-  def call(account, target_account)
+  def call(account, target_account, softblock: false)
     return if account.id == target_account.id
 
-    UnfollowService.new.call(account, target_account) if account.following?(target_account)
-    UnfollowService.new.call(target_account, account) if target_account.following?(account)
+    UnfollowService.new.call(account, target_account, force: softblock) if softblock || account.following?(target_account)
+    UnfollowService.new.call(target_account, account, force: softblock) if softblock || target_account.following?(account)
     RejectFollowService.new.call(target_account, account) if target_account.requested?(account)
 
     block = account.block!(target_account)
 
-    BlockWorker.perform_async(account.id, target_account.id)
+    BlockWorker.perform_async(account.id, target_account.id) unless softblock
     create_notification(block) if !target_account.local? && target_account.activitypub?
     block
   end