Skip ActivityPub Announces of non-public objects (#6230)

* Skip ActivityPub Announces of non-public objects * Skip OStatus reblogs of non-public statuses
2018-01-09 19:35:10 +01:00
parent d41f0b66cc
commit 35b84985a8
2 changed files with 8 additions and 1 deletions
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@ -26,6 +26,9 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
    cached_reblog = reblog
    status = nil

+    # Skip if the reblogged status is not public
+    return if cached_reblog && !(cached_reblog.public_visibility? || cached_reblog.unlisted_visibility?)
+
    media_attachments = save_media

    ApplicationRecord.transaction do