nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug that timeline can not be displayed by InvalidURIError (#2947)

This commit is contained in:
abcang 2017-05-10 01:17:41 +09:00 committed by Eugen Rochko
parent 2fba94b36e
commit 08e94d1b19
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/formatter.rb
View File

@ -92,6 +92,8 @@ class Formatter
rel: 'nofollow noopener', rel: 'nofollow noopener',
} }
Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), normalized_url, html_attrs) Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), normalized_url, html_attrs)
rescue Addressable::URI::InvalidURIError
encode(entity[:url])
end end
def link_to_mention(entity, mentions) def link_to_mention(entity, mentions)

7
spec/lib/formatter_spec.rb
View File

@ -123,6 +123,13 @@ RSpec.describe Formatter do
expect(subject).to match '<p>&lt;img src=&quot;javascript:alert(&apos;XSS&apos;);&quot;&gt;</p>' expect(subject).to match '<p>&lt;img src=&quot;javascript:alert(&apos;XSS&apos;);&quot;&gt;</p>'
end end
end end
context 'contains invalid URL' do
let(:local_text) { 'http://www\.google\.com' }
it 'has valid url' do
expect(subject).to eq '<p>http://www\.google\.com</p>'
end
end
end end
describe '#reformat' do describe '#reformat' do