github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Only display the words that fails censored words validations.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-01-24 13:11:05 +08:00
parent ff508ed75f
commit ce07da1d8b
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/validators/censored_words_validator.rb
View File

@ -1,15 +1,28 @@
class CensoredWordsValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
if !SiteSetting.censored_words.blank? && value =~ /#{SiteSetting.censored_words}/i
if !SiteSetting.censored_words.blank? &&
!(censored_words = value.scan(/#{SiteSetting.censored_words}/i)).empty?
record.errors.add(
attribute, :contains_censored_words,
censored_words: SiteSetting.censored_words
censored_words: join_censored_words(censored_words)
)
elsif !SiteSetting.censored_pattern.blank? && value =~ /#{SiteSetting.censored_pattern}/i
elsif !SiteSetting.censored_pattern.blank? &&
!(censored_words = value.scan(/#{SiteSetting.censored_pattern}/i)).empty?
byebug
record.errors.add(
attribute, :matches_censored_pattern,
censored_pattern: SiteSetting.censored_pattern
censored_words: join_censored_words(censored_words)
)
end
end
private
def join_censored_words(censored_words)
censored_words.map!(&:downcase)
censored_words.uniq!
censored_words.join(", ")
end
end