about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-04-11 00:50:09 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-04-11 00:50:09 +0000
commit33c2bbdda7f94789dc0455711093ee788c64a531 (patch)
treecaced55ea5ede3baa6e13cf15d8a869121dd3d4f /app/services
parent67e77f230e93b2e2ac05632a7cccdb5f26537f3b (diff)
parentd9b62e34da0c0238176f27557ac7b953da94df7e (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/services')
-rw-r--r--app/services/post_status_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 74b4cba0c..fe03c044c 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],
+                                        sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]),
                                         spoiler_text: options[:spoiler_text] || '',
                                         visibility: options[:visibility] || account.user&.setting_default_privacy,
                                         language: LanguageDetector.instance.detect(text, account),