diff options
author | David Yip <yipdw@member.fsf.org> | 2018-05-18 07:53:04 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-05-18 08:47:10 -0500 |
commit | e0eebba46192e5ef2050347069c4098d33e9ec54 (patch) | |
tree | e58d15f7bd6d5c5f5ce53d880a7ad89bf3faaab2 /app/lib/activitypub/activity.rb | |
parent | 4c0770d6c8dac8177b8891a6fb97ccf440100fc2 (diff) | |
parent | 57b503d4ef0754e4651eae26b628cba60e1ab4e9 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml
Diffstat (limited to 'app/lib/activitypub/activity.rb')
-rw-r--r-- | app/lib/activitypub/activity.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 84d4b1752..03476920b 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -118,4 +118,13 @@ class ActivityPub::Activity def delete_later!(uri) redis.setex("delete_upon_arrival:#{@account.id}:#{uri}", 6.hours.seconds, uri) end + + def fetch_remote_original_status + if object_uri.start_with?('http') + return if ActivityPub::TagManager.instance.local_uri?(object_uri) + ActivityPub::FetchRemoteStatusService.new.call(object_uri, id: true, on_behalf_of: @account.followers.local.first) + elsif @object['url'].present? + ::FetchRemoteStatusService.new.call(@object['url']) + end + end end |