maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not create mentions when embedded within a comment liquid tag (#13552)

Browse source 
Fixes https://github.com/forem/forem/issues/13348.
This commit is contained in:
Vaidehi Joshi 2021-04-28 08:27:26 -07:00 • committed by GitHub
parent c6d3628480
commit f9a6067662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/services/mentions/create_all.rb
View file

@ -38,9 +38,13 @@ module Mentions
def extract_usernames_from_mentions_in_text
# The "mentioned-user" css is added by Html::Parser#user_link_if_exists
doc = Nokogiri::HTML(notifiable.processed_html)
doc.css(".mentioned-user").map do |link|
link.text.delete("@").downcase
# Remove any mentions that are embedded within a comment liquid tag
non_liquid_tag_mentions = doc.css(".mentioned-user").reject do |tag|
tag.ancestors(".liquid-comment").any?
end
non_liquid_tag_mentions.map { |link| link.text.delete("@").downcase }
end
def reject_notifiable_author(users)

15
spec/services/mentions/create_all_spec.rb
View file

@ -39,6 +39,15 @@ RSpec.describe Mentions::CreateAll, type: :service do
expect(Mention.all.size).to eq(1)
end
it "ignores mentions when embedded within a comment liquid tag" do
markdown = "Check out this comment: {% comment #{comment2.id_code_generated} %}"
comment_with_liquid_tag = create(:comment, user_id: user2.id, commentable: article, body_markdown: markdown)
comment_with_liquid_tag.save
described_class.call(comment_with_liquid_tag)
expect(Mention.all.size).to eq(0)
end
it "creates multiple mentions for multiple users" do
user2 = create(:user)
comment.body_markdown = "Hello @#{user.username} @#{user2.username}, you are cool."
@ -59,18 +68,18 @@ RSpec.describe Mentions::CreateAll, type: :service do
expect(Mention.all.size).to eq(1)
end
it "creates mention on creation of comment (in addition to update)" do
it "creates a mention on creation of comment" do
described_class.call(comment2)
expect(Mention.all.size).to eq(1)
end
it "can only be created with valid mentionable" do
it "does not create a mention without valid mentionable" do
comment2.update_column(:body_markdown, "")
described_class.call(comment2)
expect(Mention.all.size).to eq(0)
end
it "cant mention self" do
it "does not create a mention when the user mentions themselves" do
comment.body_markdown = "Me, Myself and I @#{user2.username}"
comment.save
described_class.call(comment)