diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-18 10:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 10:18:52 +0200 |
| commit | 4beb8d77889e4e152a483e4d17724fa83e7c0dd3 (patch) | |
| tree | f997699db29bb7e01d03d8ab93b9051ad50d2ef3 /app | |
| parent | 9ca21e93cc1506d0a3c0cfe450636933c3d2388a (diff) | |
| parent | 6e227ecb04ee59b36a47bff7be1f1639b0d9c8da (diff) | |
Merge pull request #1053 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/reblog_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index deaa0549e..77ec52ab8 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -18,7 +18,9 @@ class ReblogService < BaseService 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) |