Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: censored_pattern with group capturing wasn't working

This commit is contained in:
Régis Hanol 2017-04-10 23:38:48 +02:00
parent db77640634
commit 2be14a604c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/validators/censored_words_validator.rb
View File

@ -1,15 +1,11 @@
class CensoredWordsValidator < ActiveModel::EachValidator class CensoredWordsValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value) def validate_each(record, attribute, value)
if !SiteSetting.censored_words.blank? && if SiteSetting.censored_words.present? && (censored_words = censor_words(value, censored_words_regexp)).present?
!(censored_words = value.scan(censored_words_regexp)).empty?
record.errors.add( record.errors.add(
attribute, :contains_censored_words, attribute, :contains_censored_words,
censored_words: join_censored_words(censored_words) censored_words: join_censored_words(censored_words)
) )
elsif !SiteSetting.censored_pattern.blank? && elsif SiteSetting.censored_pattern.present? && (censored_words = censor_words(value, /#{SiteSetting.censored_pattern}/i)).present?
!(censored_words = value.scan(/#{SiteSetting.censored_pattern}/i)).empty?
record.errors.add( record.errors.add(
attribute, :matches_censored_pattern, attribute, :matches_censored_pattern,
censored_words: join_censored_words(censored_words) censored_words: join_censored_words(censored_words)
@ -19,6 +15,16 @@ class CensoredWordsValidator < ActiveModel::EachValidator
private private
def censor_words(value, regexp)
censored_words = value.scan(regexp)
censored_words.flatten!
censored_words.compact!
censored_words.map!(&:strip)
censored_words.select!(&:present?)
censored_words.uniq!
censored_words
end
def join_censored_words(censored_words) def join_censored_words(censored_words)
censored_words.map!(&:downcase) censored_words.map!(&:downcase)
censored_words.uniq! censored_words.uniq!