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

FIX: remove "fake" mentions from extract_mentions (#26253)

Browse Source 
```
<a class="mention" href="/u/test1">bsam</a>
```

Is not a mention of the user sam. We expect an @ in front always.
This commit is contained in:
Sam 2024-03-20 12:20:15 +11:00 committed by GitHub
parent 4ca41e0af2
commit 34a14112a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pretty_text.rb
View File

@ -464,11 +464,9 @@ module PrettyText
mentions = mentions =
cooked cooked
.css(".mention, .mention-group") .css(".mention, .mention-group")
.map do |e| .filter_map do |e|
if (name = e.inner_text) if (name = e.inner_text)
name = name[1..-1] User.normalize_username(name[1..-1]) if name[0] == "@"
name = User.normalize_username(name)
name
end end
end end

4
spec/lib/pretty_text_spec.rb
View File

@ -569,13 +569,13 @@ RSpec.describe PrettyText do
<a class="mention" href="/u/test">@test</a>, <a class="mention" href="/u/test">@test</a>,
<a class="mention-group" href="/g/test-group">@test-group</a>, <a class="mention-group" href="/g/test-group">@test-group</a>,
<a class="custom-mention" href="/custom-mention">@test-custom</a>, <a class="custom-mention" href="/custom-mention">@test-custom</a>,
<a class="mention" href="/u/test1">test1</a>,
this is a test this is a test
</p> </p>
HTML HTML
extracted_mentions = PrettyText.extract_mentions(Nokogiri::HTML5.fragment(cooked_html)) extracted_mentions = PrettyText.extract_mentions(Nokogiri::HTML5.fragment(cooked_html))
expect(extracted_mentions).to include("test", "test-group") expect(extracted_mentions).to contain_exactly("test", "test-group")
expect(extracted_mentions).not_to include("test-custom")
Plugin::Instance Plugin::Instance
.new .new