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

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Browse Source 
Conflicts:
      app/javascript/styles/mastodon/components.scss
This commit is contained in:
David Yip
2018-02-02 08:39:52 -06:00
parent ad3a2dfb66 33f56811e3
commit 4c1fd9a19c
30 changed files with 244 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/fetch_link_card_service.rb
View File

@@ -91,13 +91,13 @@ class FetchLinkCardService < BaseService
case @card.type
when 'link'
@card.image = URI.parse(embed.thumbnail_url) if embed.respond_to?(:thumbnail_url)
@card.image_remote_url = embed.thumbnail_url if embed.respond_to?(:thumbnail_url)
when 'photo'
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
@card.embed_url = embed.url
@card.image_remote_url = embed.url
@card.width = embed.width.presence || 0
@card.height = embed.height.presence || 0
when 'video'
@card.width = embed.width.presence || 0
@card.height = embed.height.presence || 0