diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
commit | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (patch) | |
tree | 4bb60f4493fb70cada728a373f74c18b87e8f95d /app/services/fetch_link_card_service.rb | |
parent | f72ad67a3967230afd63a9e2d84a2a69331c4787 (diff) | |
parent | 894da3dcca781e27ce9c5130f1021526ac8a6887 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/services/fetch_link_card_service.rb')
-rw-r--r-- | app/services/fetch_link_card_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index cf3d78683..7029c4d75 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -72,6 +72,8 @@ class FetchLinkCardService < BaseService def attempt_oembed response = OEmbed::Providers.get(@url) + return false unless response.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 : '' @@ -113,7 +115,7 @@ class FetchLinkCardService < BaseService detector.strip_tags = true guess = detector.detect(html, response.charset) - page = Nokogiri::HTML(html, nil, guess&.fetch(:encoding)) + page = Nokogiri::HTML(html, nil, guess&.fetch(:encoding, nil)) if meta_property(page, 'twitter:player') @card.type = :video |