Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change fetch link card service to parse as HTML5 (#31814)

Browse source
This commit is contained in:
Mike Dalessio 2024-09-09 06:59:42 -04:00 • committed by GitHub
parent 9d9901cc5b
commit a0ea2fa3b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/lib/link_details_extractor.rb
View file

@ -157,11 +157,11 @@ class LinkDetailsExtractor
end
def title
html_entities_decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)&.strip
html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)&.strip
end
def description
html_entities_decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
html_entities.decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description'))
end
def published_at
@ -181,7 +181,7 @@ class LinkDetailsExtractor
end
def provider_name
html_entities_decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
html_entities.decode(structured_data&.publisher_name || opengraph_tag('og:site_name'))
end
def provider_url
@ -189,7 +189,7 @@ class LinkDetailsExtractor
end
def author_name
html_entities_decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
html_entities.decode(structured_data&.author_name || opengraph_tag('og:author') || opengraph_tag('og:author:username'))
end
def author_url
@ -258,7 +258,7 @@ class LinkDetailsExtractor
next if json_ld.blank?
structured_data = StructuredData.new(html_entities_decode(json_ld))
structured_data = StructuredData.new(html_entities.decode(json_ld))
next unless structured_data.valid?
@ -274,11 +274,20 @@ class LinkDetailsExtractor
end
def detect_encoding_and_parse_document
[detect_encoding, nil, header_encoding].uniq.each do |encoding|
document = Nokogiri::HTML(@html, nil, encoding)
return document if document.to_s.valid_encoding?
html = nil
encoding = nil
[detect_encoding, header_encoding].compact.each do |enc|
html = @html.dup.force_encoding(enc)
if html.valid_encoding?
encoding = enc
break
end
end
Nokogiri::HTML(@html, nil, 'UTF-8')
html = @html unless encoding
Nokogiri::HTML5(html, nil, encoding)
end
def detect_encoding
@ -299,15 +308,6 @@ class LinkDetailsExtractor
end
end
def html_entities_decode(string)
return if string.nil?
unicode_string = string.to_s.encode('UTF-8')
raise EncodingError, 'cannot convert string to valid UTF-8' unless unicode_string.valid_encoding?
html_entities.decode(unicode_string)
end
def html_entities
@html_entities ||= HTMLEntities.new(:expanded)
end