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

Handle duplicate ActivityPub activities (#4639)

Browse Source 
* Handle duplicate ActivityPub activities

Only perform side-effects when record processed for the first time

* Fast-forward repeat follow requests
This commit is contained in:
Eugen Rochko
2017-08-20 16:53:47 +02:00
committed by GitHub
parent 93d4192a67
commit fe5b66aa08
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/lib/activitypub/activity/follow.rb
View File

@ -4,7 +4,13 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
def perform
target_account = account_from_uri(object_uri)
return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id'])
return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.requested?(target_account)
# Fast-forward repeat follow requests
if @account.following?(target_account)
AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true)
return
end
follow_request = FollowRequest.create!(account: @account, target_account: target_account)