github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 14:53:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Unicode aware text sentinel (#4301)

Browse Source 
* FIX: Handle unicode text on Text Sentinel

Uses active_support to properly handle unicode text

* Adds test cases to unicode Text Sentinel
This commit is contained in:
Rafael dos Santos Silva 2016-07-12 12:08:55 -03:00 committed by Robin Ward
parent 166d753bd3
commit 5915929166
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/text_sentinel.rb
View File

@ -1,3 +1,7 @@
# Whe use ActiveSupport mb_chars from here to properly support non ascii downcase
# TODO remove when ruby 2.4 lands
require 'active_support/core_ext/string/multibyte'
#
# Given a string, tell us whether or not is acceptable.
#
@ -72,8 +76,8 @@ class TextSentinel
def seems_quiet?
# We don't allow all upper case content in english
SiteSetting.allow_uppercase_posts || not((@text =~ /[A-Z]+/) && !(@text =~ /[^[:ascii:]]/) && (@text == @text.upcase))
# We don't allow all upper case content
SiteSetting.allow_uppercase_posts || @text == @text.mb_chars.downcase.to_s || @text != @text.mb_chars.upcase.to_s
end
end

6
spec/components/text_sentinel_spec.rb
View File

@ -49,7 +49,7 @@ describe TextSentinel do
[ 'evil trout is evil',
"去年十社會警告",
"P.S. Пробирочка очень толковая и весьма умная, так что не обнимайтесь.",
"LOOK: 去年十社會警告"
"Look: 去年十社會警告"
].each do |valid_body|
it "handles a valid body in a private message" do
expect(TextSentinel.body_sentinel(valid_body, private_message: true)).to be_valid
@ -74,6 +74,10 @@ describe TextSentinel do
expect(TextSentinel.new(valid_string.upcase)).not_to be_valid
end
it "doesn't allow all caps foreign topics" do
expect(TextSentinel.new('É COM VOCÊ LOMBARDIAM. MA VEJAM SÓ, VEJAM SÓ. VALENDO UM MILHÃO DE REAISAMMM. MA VALE DÉRREAISAM?')).not_to be_valid
end
it "allows all caps topics when loud posts are allowed" do
SiteSetting.stubs(:allow_uppercase_posts).returns(true)
expect(TextSentinel.new(valid_string.upcase)).to be_valid