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

Allow to dereference Follow object for ActivityPub (#5772)

Browse Source 
* Allow to dereference Follow object for ActivityPub

* Accept IRI as object representation for Accept activity
This commit is contained in:
Akihiko Odaki
2018-01-04 02:08:57 +09:00
committed by Eugen Rochko
parent 53d99ebf4f
commit 161c72d66d
10 changed files with 134 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/follow_request.rb
View File

@ -21,6 +21,10 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
def object_type
:follow
end
def authorize!
account.follow!(target_account, reblogs: show_reblogs)
MergeWorker.perform_async(target_account.id, account.id)