alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

signup-info-prompt
Eugen Rochko 2017-07-13 01:47:23 +02:00 committed by GitHub
parent 5abb3d8150
commit e48d3bfd01
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/status.rb
View File

@ -124,6 +124,7 @@ class Status < ApplicationRecord
before_validation :set_reblog before_validation :set_reblog
before_validation :set_visibility before_validation :set_visibility
before_validation :set_conversation before_validation :set_conversation
before_validation :set_sensitivity
class << self class << self
def not_in_filtered_languages(account) def not_in_filtered_languages(account)
@ -250,6 +251,10 @@ class Status < ApplicationRecord
self.visibility = (account.locked? ? :private : :public) if visibility.nil? self.visibility = (account.locked? ? :private : :public) if visibility.nil?
end end
def set_sensitivity
self.sensitive = sensitive || spoiler_text.present?
end
def set_conversation def set_conversation
self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply