Skip to content
Extraits de code Groupes Projets
Valider e48d3bfd rédigé par Eugen Rochko's avatar Eugen Rochko Validation de GitHub
Parcourir les fichiers

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

parent 5abb3d81
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -124,6 +124,7 @@ class Status < ApplicationRecord ...@@ -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 ...@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter