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

Handle ActivityPub follows correctly (#4571)

Browse Source 
* 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
This commit is contained in:
Eugen Rochko
2017-08-10 22:33:12 +02:00
committed by GitHub
parent 4b8e4dca26
commit 81c1303cd6
4 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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