mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-30 10:58:31 -05:00
Merge pull request #1266 from bolandrm/fix_at_sign
fix mentions in code blocks
This commit is contained in:
commit
3c03920d30
2 changed files with 8 additions and 0 deletions
|
@ -51,6 +51,9 @@ class PostAnalyzer
|
|||
return @raw_mentions if @raw_mentions.present?
|
||||
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
|
||||
doc = Nokogiri::HTML.fragment(raw_stripped)
|
||||
doc.search("pre").remove
|
||||
|
|
|
@ -188,6 +188,11 @@ describe PostAnalyzer do
|
|||
post_analyzer.raw_mentions.should == ['jake']
|
||||
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
|
||||
post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]@Jake[/quote] @Finn", default_topic_id)
|
||||
post_analyzer.raw_mentions.should == ['finn']
|
||||
|
|
Loading…
Reference in a new issue