Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix redundant HTTP request in FetchLinkCardService #6002

Merged
merged 1 commit into from
Dec 13, 2017
Merged

Fix redundant HTTP request in FetchLinkCardService #6002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions app/lib/provider_discovery.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,26 @@

class ProviderDiscovery < OEmbed::ProviderDiscovery
class << self
def get(url, **options)
provider = discover_provider(url, options)

options.delete(:html)

provider.get(url, options)
end

def discover_provider(url, **options)
res = Request.new(:get, url).perform
format = options[:format]

raise OEmbed::NotFound, url if res.code != 200 || res.mime_type != 'text/html'
if options[:html]
html = Nokogiri::HTML(options[:html])
else
res = Request.new(:get, url).perform

raise OEmbed::NotFound, url if res.code != 200 || res.mime_type != 'text/html'

html = Nokogiri::HTML(res.to_s)
html = Nokogiri::HTML(res.to_s)
end

if format.nil? || format == :json
provider_endpoint ||= html.at_xpath('//link[@type="application/json+oembed"]')&.attribute('href')&.value
Expand Down
58 changes: 29 additions & 29 deletions app/services/fetch_link_card_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ def process_url

return if res.code != 405 && (res.code != 200 || res.mime_type != 'text/html')

@response = Request.new(:get, @url).perform

return if @response.code != 200 || @response.mime_type != 'text/html'

@html = @response.to_s

attempt_oembed || attempt_opengraph
end

Expand Down Expand Up @@ -70,32 +76,32 @@ def skip_link?(a)
end

def attempt_oembed
response = OEmbed::Providers.get(@url)
embed = OEmbed::Providers.get(@url, html: @html)

return false unless response.respond_to?(:type)
return false unless embed.respond_to?(:type)

@card.type = response.type
@card.title = response.respond_to?(:title) ? response.title : ''
@card.author_name = response.respond_to?(:author_name) ? response.author_name : ''
@card.author_url = response.respond_to?(:author_url) ? response.author_url : ''
@card.provider_name = response.respond_to?(:provider_name) ? response.provider_name : ''
@card.provider_url = response.respond_to?(:provider_url) ? response.provider_url : ''
@card.type = embed.type
@card.title = embed.respond_to?(:title) ? embed.title : ''
@card.author_name = embed.respond_to?(:author_name) ? embed.author_name : ''
@card.author_url = embed.respond_to?(:author_url) ? embed.author_url : ''
@card.provider_name = embed.respond_to?(:provider_name) ? embed.provider_name : ''
@card.provider_url = embed.respond_to?(:provider_url) ? embed.provider_url : ''
@card.width = 0
@card.height = 0

case @card.type
when 'link'
@card.image = URI.parse(response.thumbnail_url) if response.respond_to?(:thumbnail_url)
@card.image = URI.parse(embed.thumbnail_url) if embed.respond_to?(:thumbnail_url)
when 'photo'
return false unless response.respond_to?(:url)
@card.embed_url = response.url
@card.image = URI.parse(response.url)
@card.width = response.width.presence || 0
@card.height = response.height.presence || 0
return false unless embed.respond_to?(:url)
@card.embed_url = embed.url
@card.image = URI.parse(embed.url)
@card.width = embed.width.presence || 0
@card.height = embed.height.presence || 0
when 'video'
@card.width = response.width.presence || 0
@card.height = response.height.presence || 0
@card.html = Formatter.instance.sanitize(response.html, Sanitize::Config::MASTODON_OEMBED)
@card.width = embed.width.presence || 0
@card.height = embed.height.presence || 0
@card.html = Formatter.instance.sanitize(embed.html, Sanitize::Config::MASTODON_OEMBED)
when 'rich'
# Most providers rely on <script> tags, which is a no-no
return false
Expand All @@ -107,17 +113,11 @@ def attempt_oembed
end

def attempt_opengraph
response = Request.new(:get, @url).perform

return if response.code != 200 || response.mime_type != 'text/html'

html = response.to_s

detector = CharlockHolmes::EncodingDetector.new
detector.strip_tags = true

guess = detector.detect(html, response.charset)
page = Nokogiri::HTML(html, nil, guess&.fetch(:encoding, nil))
guess = detector.detect(@html, @response.charset)
page = Nokogiri::HTML(@html, nil, guess&.fetch(:encoding, nil))

if meta_property(page, 'twitter:player')
@card.type = :video
Expand All @@ -134,16 +134,16 @@ def attempt_opengraph
@card.image_remote_url = meta_property(page, 'og:image') if meta_property(page, 'og:image')
end

@card.title = meta_property(page, 'og:title').presence || page.at_xpath('//title')&.content || ''
@card.description = meta_property(page, 'og:description').presence || meta_property(page, 'description') || ''
@card.title = meta_property(page, 'og:title').presence || page.at_xpath('//title')&.content || ''
@card.description = meta_property(page, 'og:description').presence || meta_property(page, 'description') || ''

return if @card.title.blank? && @card.html.blank?

@card.save_with_optional_image!
end

def meta_property(html, property)
html.at_xpath("//meta[@property=\"#{property}\"]")&.attribute('content')&.value || html.at_xpath("//meta[@name=\"#{property}\"]")&.attribute('content')&.value
def meta_property(page, property)
page.at_xpath("//meta[@property=\"#{property}\"]")&.attribute('content')&.value || page.at_xpath("//meta[@name=\"#{property}\"]")&.attribute('content')&.value
end

def lock_options
Expand Down