about summary refs log tree commit diff
path: root/app/services/activitypub
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-08-24 23:21:42 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-08-24 16:21:42 +0200
commitb01a19fe392e0dd16d6b3da3f0b56369f7837cc9 (patch)
treea8b4fe087dc8a3186b875517a84ce23e6bf37019 /app/services/activitypub
parentc66fe2aeba84af5ab47c20298ddc8dceaf0e179f (diff)
Fetch reblogs as Announce activity instead of Note object (#4672)
* Process Create / Announce activity in FetchRemoteStatusService

* Use activity URL in ActivityPub for reblogs

* Redirect to the original status on StatusesController#show
Diffstat (limited to 'app/services/activitypub')
-rw-r--r--app/services/activitypub/fetch_remote_status_service.rb30
1 files changed, 21 insertions, 9 deletions
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index 993e5389c..c114515cd 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -7,21 +7,33 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   def call(uri, prefetched_json = nil)
     @json = body_to_json(prefetched_json) || fetch_resource(uri)
 
-    return unless supported_context? && expected_type?
+    return unless supported_context?
 
-    attributed_to = first_of_value(@json['attributedTo'])
-    attributed_to = attributed_to['id'] if attributed_to.is_a?(Hash)
+    activity = activity_json
+    actor_id = value_or_id(activity['actor'])
 
-    return unless trustworthy_attribution?(uri, attributed_to)
+    return unless expected_type?(activity) && trustworthy_attribution?(uri, actor_id)
 
-    actor = ActivityPub::TagManager.instance.uri_to_resource(attributed_to, Account)
-    actor = ActivityPub::FetchRemoteAccountService.new.call(attributed_to) if actor.nil?
+    actor = ActivityPub::TagManager.instance.uri_to_resource(actor_id, Account)
+    actor = ActivityPub::FetchRemoteAccountService.new.call(actor_id) if actor.nil?
 
-    ActivityPub::Activity::Create.new({ 'object' => @json }, actor).perform
+    ActivityPub::Activity.factory(activity, actor).perform
   end
 
   private
 
+  def activity_json
+    if %w(Note Article).include? @json['type']
+      {
+        'type' => 'Create',
+        'actor' => first_of_value(@json['attributedTo']),
+        'object' => @json,
+      }
+    else
+      @json
+    end
+  end
+
   def trustworthy_attribution?(uri, attributed_to)
     Addressable::URI.parse(uri).normalized_host.casecmp(Addressable::URI.parse(attributed_to).normalized_host).zero?
   end
@@ -30,7 +42,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
     super(@json)
   end
 
-  def expected_type?
-    %w(Note Article).include? @json['type']
+  def expected_type?(json)
+    %w(Create Announce).include? json['type']
   end
 end