github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-28 23:36:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Mention lookup should be case insensitive.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-11-22 16:32:56 +08:00
parent 3f636b2d19
commit 28a6cf8228
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pretty_text.rb
View File

@ -429,7 +429,7 @@ module PrettyText
def self.add_mentions(doc, user_id: nil) def self.add_mentions(doc, user_id: nil)
elements = doc.css("span.mention") elements = doc.css("span.mention")
names = elements.map { |element| element.text[1..-1] } names = elements.map { |element| name = element.text[1..-1] }
mentions = lookup_mentions(names, user_id: user_id) mentions = lookup_mentions(names, user_id: user_id)
@ -475,6 +475,7 @@ module PrettyText
SQL SQL
user = User.find_by(id: user_id) user = User.find_by(id: user_id)
names.each(&:downcase!)
results = DB.query(sql, results = DB.query(sql,
names: names, names: names,

10
spec/components/pretty_text_spec.rb
View File

@ -221,7 +221,7 @@ describe PrettyText do
end end
it "handles user and group mentions correctly" do it "handles user and group mentions correctly" do
['user', 'user2'].each do |username | ['User', 'user2'].each do |username |
Fabricate(:user, username: username) Fabricate(:user, username: username)
end end
@ -231,12 +231,12 @@ describe PrettyText do
[ [
[ [
'hi @user! @user2 hi', 'hi @uSer! @user2 hi',
'<p>hi <a class="mention" href="/u/user">@user</a>! <a class="mention" href="/u/user2">@user2</a> hi</p>' '<p>hi <a class="mention" href="/u/user">@uSer</a>! <a class="mention" href="/u/user2">@user2</a> hi</p>'
], ],
[ [
"hi\n@user. @#{group.name} @somemention", "hi\n@user. @#{group.name.capitalize} @somemention",
%Q|<p>hi<br>\n<a class="mention" href="/u/user">@user</a>. <a class="mention-group" href="/groups/#{group.name}">@#{group.name}</a> <span class="mention">@somemention</span></p>| %Q|<p>hi<br>\n<a class="mention" href="/u/user">@user</a>. <a class="mention-group" href="/groups/#{group.name}">@#{group.name.capitalize}</a> <span class="mention">@somemention</span></p>|
] ]
].each do |input, expected| ].each do |input, expected|
expect(PrettyText.cook(input)).to eq(expected) expect(PrettyText.cook(input)).to eq(expected)