github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 13:15:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: always truncate uncomplete emojis in excerpts (#11678)

Browse Source 
Additional fix after https://github.com/discourse/discourse/pull/11667

Always truncate "broken" emojis from excerpts.
This commit is contained in:
Krzysztof Kotlarek
2021-01-11 13:43:11 +11:00
committed by GitHub
parent 7f78b6ec10
commit efaa63bd1d
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/post.rb
View File

@ -486,7 +486,7 @@ class Post < ActiveRecord::Base
end end
def excerpt_for_topic def excerpt_for_topic
Post.excerpt(cooked, SiteSetting.topic_excerpt_maxlength, strip_links: true, strip_images: true, strip_truncated_emoji_code: true, post: self) Post.excerpt(cooked, SiteSetting.topic_excerpt_maxlength, strip_links: true, strip_images: true, post: self)
end end
def is_first_post? def is_first_post?

9
lib/excerpt_parser.rb
View File

@ -13,7 +13,6 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
options || {} options || {}
@strip_links = options[:strip_links] == true @strip_links = options[:strip_links] == true
@strip_images = options[:strip_images] == true @strip_images = options[:strip_images] == true
@strip_truncated_emoji_code = options[:strip_truncated_emoji_code] == true
@text_entities = options[:text_entities] == true @text_entities = options[:text_entities] == true
@markdown_images = options[:markdown_images] == true @markdown_images = options[:markdown_images] == true
@keep_newlines = options[:keep_newlines] == true @keep_newlines = options[:keep_newlines] == true
@ -208,7 +207,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
encode = encode ? lambda { |s| ERB::Util.html_escape(s) } : lambda { |s| s } encode = encode ? lambda { |s| ERB::Util.html_escape(s) } : lambda { |s| s }
if count_it && @current_length + string.length > @length if count_it && @current_length + string.length > @length
length = [0, @length - @current_length - 1].max length = [0, @length - @current_length - 1].max
@excerpt << encode.call(string[0..length]) if truncate && !truncated_emoji_code?(string) @excerpt << encode.call(string[0..length]) if truncate && !emoji?(string)
@excerpt << (@text_entities ? "..." : "&hellip;") @excerpt << (@text_entities ? "..." : "&hellip;")
@excerpt << "</a>" if @in_a @excerpt << "</a>" if @in_a
@excerpt << after_string if after_string @excerpt << after_string if after_string
@ -220,11 +219,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
@current_length += string.length if count_it @current_length += string.length if count_it
end end
def truncated_emoji_code?(string)
@strip_truncated_emoji_code && emoji?(string)
end
def emoji?(string) def emoji?(string)
string.match?(/:\w+:/) string.match?(/\A:\w+:\Z/)
end end
end end

18
spec/components/pretty_text_spec.rb
View File

@ -641,16 +641,14 @@ describe PrettyText do
html = <<~EOS html = <<~EOS
<img src=\"//localhost:3000/images/emoji/twitter/bike.png?v=9\" title=\":bike:\" class=\"emoji\" alt=\":bike:\"> <img src=\"//localhost:3000/images/emoji/twitter/cat.png?v=9\" title=\":cat:\" class=\"emoji\" alt=\":cat:\"> <img src=\"//localhost:3000/images/emoji/twitter/discourse.png?v=9\" title=\":discourse:\" class=\"emoji\" alt=\":discourse:\"> <img src=\"//localhost:3000/images/emoji/twitter/bike.png?v=9\" title=\":bike:\" class=\"emoji\" alt=\":bike:\"> <img src=\"//localhost:3000/images/emoji/twitter/cat.png?v=9\" title=\":cat:\" class=\"emoji\" alt=\":cat:\"> <img src=\"//localhost:3000/images/emoji/twitter/discourse.png?v=9\" title=\":discourse:\" class=\"emoji\" alt=\":discourse:\">
EOS EOS
expect(PrettyText.excerpt(html, 10, strip_truncated_emoji_code: false)).to eq(":bike: :ca&hellip;") expect(PrettyText.excerpt(html, 7)).to eq(":bike: &hellip;")
expect(PrettyText.excerpt(html, 8)).to eq(":bike: &hellip;")
expect(PrettyText.excerpt(html, 7, strip_truncated_emoji_code: true)).to eq(":bike: &hellip;") expect(PrettyText.excerpt(html, 9)).to eq(":bike: &hellip;")
expect(PrettyText.excerpt(html, 8, strip_truncated_emoji_code: true)).to eq(":bike: &hellip;") expect(PrettyText.excerpt(html, 10)).to eq(":bike: &hellip;")
expect(PrettyText.excerpt(html, 9, strip_truncated_emoji_code: true)).to eq(":bike: &hellip;") expect(PrettyText.excerpt(html, 11)).to eq(":bike: &hellip;")
expect(PrettyText.excerpt(html, 10, strip_truncated_emoji_code: true)).to eq(":bike: &hellip;") expect(PrettyText.excerpt(html, 12)).to eq(":bike: :cat: &hellip;")
expect(PrettyText.excerpt(html, 11, strip_truncated_emoji_code: true)).to eq(":bike: &hellip;") expect(PrettyText.excerpt(html, 13)).to eq(":bike: :cat: &hellip;")
expect(PrettyText.excerpt(html, 12, strip_truncated_emoji_code: true)).to eq(":bike: :cat: &hellip;") expect(PrettyText.excerpt(html, 14)).to eq(":bike: :cat: &hellip;")
expect(PrettyText.excerpt(html, 13, strip_truncated_emoji_code: true)).to eq(":bike: :cat: &hellip;")
expect(PrettyText.excerpt(html, 14, strip_truncated_emoji_code: true)).to eq(":bike: :cat: &hellip;")
end end
end end