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

17
app/lib/activitypub/activity/accept.rb
View File

@@ -2,16 +2,18 @@
class ActivityPub::Activity::Accept < ActivityPub::Activity
def perform
case @object['type']
when 'Follow'
accept_follow
if @object.respond_to?(:[]) &&
@object['type'] == 'Follow' && @object['actor'].present?
accept_follow_from @object['actor']
else
accept_follow_object @object
end
end
private
def accept_follow
target_account = account_from_uri(target_uri)
def accept_follow_from(actor)
target_account = account_from_uri(value_or_id(actor))
return if target_account.nil? || !target_account.local?
@@ -19,7 +21,8 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
follow_request&.authorize!
end
def target_uri
@target_uri ||= value_or_id(@object['actor'])
def accept_follow_object(object)
follow_request = ActivityPub::TagManager.instance.uri_to_resource(value_or_id(object), FollowRequest)
follow_request&.authorize!
end
end