diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-17 14:08:17 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-17 14:08:17 +0200 |
| commit | 1ee675d68bfd2034183a03408a2377c338dfac41 (patch) | |
| tree | 24cf9ccf427e947cf9bfd14d56b2727b633e793d | |
| parent | 4601a58ac24f2c97ba4934445da694ca18308b81 (diff) | |
Use correct activity id in Accept when receiving duplicate Follow (fixes #8218) (#8244)
| -rw-r--r-- | app/lib/activitypub/activity/follow.rb | 2 | ||||
| -rw-r--r-- | app/services/authorize_follow_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index 826dcf18e..c45832648 100644 --- a/app/lib/activitypub/activity/follow.rb +++ b/app/lib/activitypub/activity/follow.rb @@ -13,7 +13,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity # Fast-forward repeat follow requests if @account.following?(target_account) - AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true) + AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true, follow_request_uri: @json['id']) return end diff --git a/app/services/authorize_follow_service.rb b/app/services/authorize_follow_service.rb index f47d488f1..1674239df 100644 --- a/app/services/authorize_follow_service.rb +++ b/app/services/authorize_follow_service.rb @@ -3,7 +3,7 @@ class AuthorizeFollowService < BaseService def call(source_account, target_account, **options) if options[:skip_follow_request] - follow_request = FollowRequest.new(account: source_account, target_account: target_account) + follow_request = FollowRequest.new(account: source_account, target_account: target_account, uri: options[:follow_request_uri]) else follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account) follow_request.authorize! |