diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-18 01:03:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 01:03:18 +0200 |
commit | 40c45f5dd958aa1319b4e8cb664e6b4cac029526 (patch) | |
tree | bab31e85e1cbdaa50695e52595302042b361f087 /app/lib/ostatus/activity/remote.rb | |
parent | efec02f1538adc7f75ba9ca3716ea25b3f2ef4df (diff) |
Put ActivityPub alternate link into Atom, prefer it when processing Atom (#4623)
Diffstat (limited to 'app/lib/ostatus/activity/remote.rb')
-rw-r--r-- | app/lib/ostatus/activity/remote.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/ostatus/activity/remote.rb b/app/lib/ostatus/activity/remote.rb index ecec6886c..5b204b6d8 100644 --- 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 |