diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-09 14:16:45 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-09 14:16:45 -0600 |
| commit | 991371af5f22ba85199f3f66bab5f70b404de95f (patch) | |
| tree | 3e5652e1d90596c57b70d2afac72b17f183b8734 /app/lib/ostatus/activity/creation.rb | |
| parent | e780d5951b7eb743a718d9b34a46cd8fa5561636 (diff) | |
| parent | 35b84985a8b9e57cfd3ffac8a0e3937d3c7a1167 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: db/schema.rb
Diffstat (limited to 'app/lib/ostatus/activity/creation.rb')
| -rw-r--r-- | app/lib/ostatus/activity/creation.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index f210e134a..b38407cd3 100644 --- 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 |