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

Normalize URL from Feed Entry after adding link to original in Topic

Browse Source 
Since a URL might be case sensitive, adding a link to the original
Feed Entry with changed case to the Topic could end in 404.
This commit is contained in:
Aslak Knutsen 2014-03-27 04:24:57 +01:00
parent ec1ea18877
commit f011fbdca9
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/topic_embed.rb
View File

@ -14,13 +14,13 @@ class TopicEmbed < ActiveRecord::Base
def self.import(user, url, title, contents)
return unless url =~ /^https?\:\/\//
url = normalize_url(url)
if SiteSetting.embed_truncate
contents = first_paragraph_from(contents)
end
contents << "\n<hr>\n<small>#{I18n.t('embed.imported_from', link: "<a href='#{url}'>#{url}</a>")}</small>\n"
url = normalize_url(url)
embed = TopicEmbed.where("lower(embed_url) = ?", url).first
content_sha1 = Digest::SHA1.hexdigest(contents)
post = nil

11
spec/models/topic_embed_spec.rb
View File

@ -41,6 +41,17 @@ describe TopicEmbed do
post.cooked.should =~ /new contents/
end
it "Should leave uppercase Feed Entry URL untouched in content" do
cased_url = 'http://eviltrout.com/ABCD'
post = TopicEmbed.import(user, cased_url, title, "some random content")
post.cooked.should =~ /#{cased_url}/
end
it "Should leave lowercase Feed Entry URL untouched in content" do
cased_url = 'http://eviltrout.com/abcd'
post = TopicEmbed.import(user, cased_url, title, "some random content")
post.cooked.should =~ /#{cased_url}/
end
end
end