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

FIX: trim trailing slash from topic links

This commit is contained in:
Arpit Jalan 2019-01-02 18:01:50 +05:30
parent 30a1d29a7e
commit 993f847a2c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/topic_link.rb
View File

@ -205,7 +205,7 @@ SQL
reflected_post = Post.find_by(topic_id: topic_id, post_number: post_number.to_i) reflected_post = Post.find_by(topic_id: topic_id, post_number: post_number.to_i)
end end
url = url[0...TopicLink.max_url_length] url = url[0...TopicLink.max_url_length]&.chomp("/")
return nil if parsed && parsed.host && parsed.host.length > TopicLink.max_domain_length return nil if parsed && parsed.host && parsed.host.length > TopicLink.max_domain_length
unless TopicLink.exists?(topic_id: post.topic_id, post_id: post.id, url: url) unless TopicLink.exists?(topic_id: post.topic_id, post_id: post.id, url: url)

2
spec/models/topic_link_spec.rb
View File

@ -41,7 +41,7 @@ describe TopicLink do
it 'works' do it 'works' do
expect(topic.topic_links.pluck(:url)).to contain_exactly( expect(topic.topic_links.pluck(:url)).to contain_exactly(
"http://a.com/", "http://a.com",
"https://b.com/b", "https://b.com/b",
"//b.com/#{'a' * 500}"[0...TopicLink.max_url_length] "//b.com/#{'a' * 500}"[0...TopicLink.max_url_length]
) )