diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-06 22:34:42 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 22:34:42 -0600 |
| commit | ddb61deccefeda2346e64002528764841bcb7315 (patch) | |
| tree | 0ee86119b8260661d85e5e41a1342c30802f620b /app/services | |
| parent | 935c1944e27be4df9ba821a0f38fd599d1877a31 (diff) | |
| parent | 744447b3c04d7806e383f0d1ad7a10c73bd667ef (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/fetch_link_card_service.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index 37cf75379..cec96d927 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -74,9 +74,6 @@ class FetchLinkCardService < BaseService return false unless response.respond_to?(:type) - # The photo will change the URL. So, to avoid duplication of URLs, PreviewCard needs to be checked again. - @card = PreviewCard.find_by(url: response.url) || @card if response.type == 'photo' - @card.type = response.type @card.title = response.respond_to?(:title) ? response.title : '' @card.author_name = response.respond_to?(:author_name) ? response.author_name : '' @@ -90,9 +87,9 @@ class FetchLinkCardService < BaseService 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 + @card.embed_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 |