Put ActivityPub alternate link into Atom, prefer it when processing Atom (#4623)

2017-08-18 01:03:18 +02:00
parent efec02f153
commit 40c45f5dd9
6 changed files with 32 additions and 8 deletions
--- a/app/lib/ostatus/activity/remote.rb
+++ b/app/lib/ostatus/activity/remote.rb
@ -2,6 +2,10 @@

 class OStatus::Activity::Remote < OStatus::Activity::Base
  def perform
-    find_status(id) || FetchRemoteStatusService.new.call(url)
+    if activitypub_uri?
+      find_status(activitypub_uri) || FetchRemoteStatusService.new.call(url)
+    else
+      find_status(id) || FetchRemoteStatusService.new.call(url)
+    end
  end
 end