diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-12 16:39:30 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-06-12 16:39:30 -0500 |
| commit | e931cf656d1de6d89b5b048d8f1de15be7b52690 (patch) | |
| tree | b1c0c66b6a88b56c422ea8be1dbef77e42afae72 /app/services/post_status_service.rb | |
| parent | 97d2df77aae687c983c1294ebcd3962e4f9d985c (diff) | |
| parent | 34f1fd2a621ca869c17009487e2f10063812fbd0 (diff) | |
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
Conflicts: app/models/glitch/keyword_mute.rb
Diffstat (limited to 'app/services/post_status_service.rb')
| -rw-r--r-- | app/services/post_status_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index b1d5bd3a7..6e982c7e6 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -28,7 +28,7 @@ class PostStatusService < BaseService status = account.statuses.create!(text: text, media_attachments: media || [], thread: in_reply_to, - sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]), + 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, language: language_from_option(options[:language]) || LanguageDetector.instance.detect(text, account), |