From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 18 May 2019 08:04:32 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6e227ecb04ee59b36a47bff7be1f1639b0d9c8da;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream
---

6e227ecb04ee59b36a47bff7be1f1639b0d9c8da
diff --cc app/services/reblog_service.rb
index deaa0549e,1710640c8..77ec52ab8
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@@ -18,14 -18,13 +18,16 @@@ class ReblogService < BaseServic
  
      return reblog unless reblog.nil?
  
-     reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: options[:visibility] || account.user&.setting_default_privacy)
+     visibility = options[:visibility] || account.user&.setting_default_privacy
+     visibility = reblogged_status.visibility if reblogged_status.hidden?
+     reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility)
  
      DistributionWorker.perform_async(reblog.id)
 -    Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
 -    ActivityPub::DistributionWorker.perform_async(reblog.id)
 +
 +    unless reblogged_status.local_only?
 +      Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
 +      ActivityPub::DistributionWorker.perform_async(reblog.id)
 +    end
  
      create_notification(reblog)
      bump_potential_friendship(account, reblog)