From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Jul 2017 23:47:23 +0000 (+0200)
Subject: Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e48d3bfd01c4bdeb36d39bbdf13b6873e3444179;p=mastodon.git

Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
---

diff --git a/app/models/status.rb b/app/models/status.rb
index 791d96df1..edf805336 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -124,6 +124,7 @@ class Status < ApplicationRecord
   before_validation :set_reblog
   before_validation :set_visibility
   before_validation :set_conversation
+  before_validation :set_sensitivity
 
   class << self
     def not_in_filtered_languages(account)
@@ -250,6 +251,10 @@ class Status < ApplicationRecord
     self.visibility = (account.locked? ? :private : :public) if visibility.nil?
   end
 
+  def set_sensitivity
+    self.sensitive = sensitive || spoiler_text.present?
+  end
+
   def set_conversation
     self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply