Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00
parent 4665965543 03b69ebc45
commit ba7ee67498
36 changed files with 314 additions and 260 deletions
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@ -30,7 +30,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
    if object_uri.start_with?('http')
      return if ActivityPub::TagManager.instance.local_uri?(object_uri)

-      ActivityPub::FetchRemoteStatusService.new.call(object_uri, id: true)
+      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