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

fix mentions in code blocks

This commit is contained in:
Ryan Boland 2013-07-30 18:01:42 -04:00
parent 028cd348e1
commit 553a671fdb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/post_analyzer.rb
View File

@ -51,6 +51,9 @@ class PostAnalyzer
return @raw_mentions if @raw_mentions.present? return @raw_mentions if @raw_mentions.present?
raw_stripped = @raw.gsub(/\[quote=(.*)\]([^\[]*?)\[\/quote\]/im, '') raw_stripped = @raw.gsub(/\[quote=(.*)\]([^\[]*?)\[\/quote\]/im, '')
# Process markdown so that code blocks can be generated and subsequently ignored
raw_stripped = PrettyText.markdown(raw_stripped)
# Strip pre and code tags # Strip pre and code tags
doc = Nokogiri::HTML.fragment(raw_stripped) doc = Nokogiri::HTML.fragment(raw_stripped)
doc.search("pre").remove doc.search("pre").remove

5
spec/models/post_analyzer_spec.rb
View File

@ -188,6 +188,11 @@ describe PostAnalyzer do
post_analyzer.raw_mentions.should == ['jake'] post_analyzer.raw_mentions.should == ['jake']
end end
it "ignores code in markdown-formatted code blocks" do
post_analyzer = PostAnalyzer.new(" @Jake @Finn\n@Ryan", default_topic_id)
post_analyzer.raw_mentions.should == ['ryan']
end
it "ignores quotes" do it "ignores quotes" do
post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]@Jake[/quote] @Finn", default_topic_id) post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]@Jake[/quote] @Finn", default_topic_id)
post_analyzer.raw_mentions.should == ['finn'] post_analyzer.raw_mentions.should == ['finn']