diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-02 01:12:02 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-01-02 01:12:02 +0100 |
| commit | 70be301d6988c229b18e165b6501f988359181ff (patch) | |
| tree | dde7033d5072c544dbb5f68b1f2cb64ef2845610 /app/lib | |
| parent | 5339554076648ee17aa714b3b73a7fcc807e303b (diff) | |
Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687)
* Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order * Add specs for Block causing unfollow and for out-of-order Block + Undo
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/block.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb index 26da8bdf5..a17a2d50a 100644 --- a/app/lib/activitypub/activity/block.rb +++ b/app/lib/activitypub/activity/block.rb @@ -4,9 +4,10 @@ class ActivityPub::Activity::Block < ActivityPub::Activity def perform target_account = account_from_uri(object_uri) - return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.blocking?(target_account) + return if target_account.nil? || !target_account.local? || @account.blocking?(target_account) UnfollowService.new.call(target_account, @account) if target_account.following?(@account) - @account.block!(target_account, uri: @json['id']) + + @account.block!(target_account, uri: @json['id']) unless delete_arrived_first?(@json['id']) end end |