diff options
author | ThibG <thib@sitedethib.com> | 2019-01-02 20:03:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-02 20:03:32 +0100 |
commit | 0acd51acdc1e670bf57f58671cb8e30743782c63 (patch) | |
tree | f5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /app/services/post_status_service.rb | |
parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
parent | e77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff) |
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/post_status_service.rb')
-rw-r--r-- | app/services/post_status_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index d7d7770e9..28ecc848d 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -26,13 +26,16 @@ class PostStatusService < BaseService text = media.find(&:video?) ? '📹' : '🖼' if media.size > 0 end + visibility = options[:visibility] || account.user&.setting_default_privacy + visibility = :unlisted if visibility == :public && account.silenced + ApplicationRecord.transaction do status = account.statuses.create!(text: text, media_attachments: media || [], thread: in_reply_to, sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]) || options[:spoiler_text].present?, spoiler_text: options[:spoiler_text] || '', - visibility: options[:visibility] || account.user&.setting_default_privacy, + visibility: visibility, language: language_from_option(options[:language]) || account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(text, account), application: options[:application]) end @@ -46,7 +49,6 @@ class PostStatusService < BaseService unless status.local_only? Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id) ActivityPub::DistributionWorker.perform_async(status.id) - ActivityPub::ReplyDistributionWorker.perform_async(status.id) if status.reply? && status.thread.account.local? end if options[:idempotency].present? |