diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 10:17:15 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 10:17:15 +0000 |
commit | f839ac694c3f8050e4c7ec84884283e35f6ac662 (patch) | |
tree | 68ab420feffbfc99de00d72f2e6b0beae4a7b7a0 /app/lib/activitypub/activity/accept.rb | |
parent | 722b3f567f18ae31b05f320441c73279b4f5ad11 (diff) | |
parent | dbda87c31f7d7ede7312ba422940841d8c96c171 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib/activitypub/activity/accept.rb')
-rw-r--r-- | app/lib/activitypub/activity/accept.rb | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb index d0082483c..bd90c9019 100644 --- a/app/lib/activitypub/activity/accept.rb +++ b/app/lib/activitypub/activity/accept.rb @@ -2,18 +2,16 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity def perform - if @object.respond_to?(:[]) && - @object['type'] == 'Follow' && @object['actor'].present? - accept_follow_from @object['actor'] - else - accept_follow_object @object + case @object['type'] + when 'Follow' + accept_follow end end private - def accept_follow_from(actor) - target_account = account_from_uri(value_or_id(actor)) + def accept_follow + target_account = account_from_uri(target_uri) return if target_account.nil? || !target_account.local? @@ -21,8 +19,7 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity follow_request&.authorize! end - def accept_follow_object(object) - follow_request = ActivityPub::TagManager.instance.uri_to_resource(value_or_id(object), FollowRequest) - follow_request&.authorize! + def target_uri + @target_uri ||= value_or_id(@object['actor']) end end |