tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687)

Browse Source 
* 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
This commit is contained in:
ThibG
2019-01-02 01:12:02 +01:00
committed by Eugen Rochko
parent 5339554076
commit 70be301d69
2 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/activitypub/activity/block.rb
View File

@@ -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