about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2018-06-04 11:46:14 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-06-04 04:46:14 +0200
commit5bf500338478f819a65d25636a0af61a482972d3 (patch)
treecff251ac9bda163d9021b1b3bf5876da453148c7 /app/models
parent73923ea6c4759e551d92d3e712bc3bb6d1ad3e60 (diff)
Do not mark remote status sensitive even if spoiler text is present (#7395)
Old statuses and statuses from Pawoo, which runs a modified version of
Mastodon, may not have been marked sensitive even if spoiler text is
present.

Such statuses are still not marked sensitve if they are local or
arrived before version upgrade. Marking recently fetched remote status
sensitive contradicts the behavior.

Considering what people expected when they authored such statuses, this
change removes the sensitivity enforcement.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 08ec36f38..b256069f7 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -187,7 +187,6 @@ class Status < ApplicationRecord
   before_validation :set_reblog
   before_validation :set_visibility
   before_validation :set_conversation
-  before_validation :set_sensitivity
   before_validation :set_local
 
   class << self
@@ -368,10 +367,6 @@ class Status < ApplicationRecord
     self.sensitive  = false if sensitive.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