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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/services/reblog_service.rb
index deaa0549ea6b867ed4b35613575464b093bb7318,1710640c81db991e3df4f109d4e99f0b9541f24e..77ec52ab8489b0e425550ed775e2264adee1a4e2
--- 1/app/services/reblog_service.rb
--- 2/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)