mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Add workaround for YouTube Shorts links (#17869) 

* Add workaround for YouTube Shorts links

* Update link_details_extractor_spec.rb
This commit is contained in:
Eugen Rochko 2022-03-25 19:31:35 +01:00 committed by GitHub
parent 9565b17d5d
commit b58db8f12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/link_details_extractor.rb
View File

@ -208,7 +208,7 @@ class LinkDetailsExtractor
end end
def valid_url_or_nil(str, same_origin_only: false) def valid_url_or_nil(str, same_origin_only: false)
return if str.blank? return if str.blank? || str == 'null'
url = @original_url + Addressable::URI.parse(str) url = @original_url + Addressable::URI.parse(str)

8
spec/lib/link_details_extractor_spec.rb
View File

@ -25,6 +25,14 @@ RSpec.describe LinkDetailsExtractor do
expect(subject.canonical_url).to eq 'https://foo.com/article' expect(subject.canonical_url).to eq 'https://foo.com/article'
end end
end end
context 'when canonical URL is set to "null"' do
let(:html) { '<!doctype html><link rel="canonical" href="null" />' }
it 'ignores the canonical URLs' do
expect(subject.canonical_url).to eq original_url
end
end
end end
context 'when structured data is present' do context 'when structured data is present' do