tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2017-12-07 04:17:14 +00:00
parent de56209951 0c4ca3e549
commit 744447b3c0
9 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/fetch_link_card_service.rb
View File

@@ -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