From 88725d6ce85115ea3b0652007db5d40a1c069be3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 27 Apr 2017 14:42:22 +0200 Subject: OEmbed support for PreviewCard (#2337) * OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller --- app/services/fetch_atom_service.rb | 6 ++-- app/services/fetch_link_card_service.rb | 51 ++++++++++++++++++++++----- app/services/follow_remote_account_service.rb | 7 ++-- app/services/post_status_service.rb | 2 +- 4 files changed, 48 insertions(+), 18 deletions(-) (limited to 'app/services') diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb index c3dad1eb9..9c514aa9f 100644 --- a/app/services/fetch_atom_service.rb +++ b/app/services/fetch_atom_service.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class FetchAtomService < BaseService + include HttpHelper + def call(url) return if url.blank? @@ -45,8 +47,4 @@ class FetchAtomService < BaseService def fetch(url) http_client.get(url).to_s end - - def http_client - HTTP.timeout(:per_operation, write: 10, connect: 10, read: 10).follow - end end diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index f74a0d34d..416c5fdad 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -1,8 +1,9 @@ # frozen_string_literal: true class FetchLinkCardService < BaseService + include HttpHelper + URL_PATTERN = %r{https?://\S+} - USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::VERSION}; +http://#{Rails.configuration.x.local_domain}/)" def call(status) # Get first http/https URL that isn't local @@ -10,13 +11,53 @@ class FetchLinkCardService < BaseService return if url.nil? + card = PreviewCard.where(status: status).first_or_initialize(status: status, url: url) + attempt_opengraph(card, url) unless attempt_oembed(card, url) + end + + private + + def attempt_oembed(card, url) + response = OEmbed::Providers.get(url) + + 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.width = 0 + card.height = 0 + + case card.type + when 'link' + card.image = URI.parse(response.thumbnail_url) if response.respond_to?(:thumbnail_url) + when 'photo' + card.url = response.url + card.width = response.width.presence || 0 + card.height = response.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) + when 'rich' + # Most providers rely on