diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-10 22:33:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 22:33:12 +0200 |
| commit | 81c1303cd6137c8c90794cc0bfdc1a0479eb2153 (patch) | |
| tree | b4b5a2f1036fab1b56ad2409f247f3e0dbdecaac /app/lib/activitypub/activity/follow.rb | |
| parent | 4b8e4dca26666c7c0709bf5aa765764023da3bdf (diff) | |
Handle ActivityPub follows correctly (#4571)
* Handle ActivityPub follows correctly ActivityPub follows are follow-requests. Always require an Accept. If account is not locked, auto-accept. * Handle ActivityPub Accept/Reject-Follow * Fix wrong method * Fix wrong class
Diffstat (limited to 'app/lib/activitypub/activity/follow.rb')
| -rw-r--r-- | app/lib/activitypub/activity/follow.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index 7918b5108..3fb698d1d 100644 --- a/app/lib/activitypub/activity/follow.rb +++ b/app/lib/activitypub/activity/follow.rb @@ -6,7 +6,13 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) - follow = @account.follow!(target_account) - NotifyService.new.call(target_account, follow) + follow_request = FollowRequest.create!(account: @account, target_account: target_account) + + if target_account.locked? + NotifyService.new.call(target_account, follow_request) + else + AuthorizeFollowService.new.call(@account, target_account) + NotifyService.new.call(target_account, ::Follow.find_by(account: @account, target_account: target_account)) + end end end |