diff options
| author | Effy Elden <github@effy.is> | 2017-04-17 01:41:33 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 01:41:33 +1000 |
| commit | acd33101c50ba0cf09c1c41616f919d37760f3f7 (patch) | |
| tree | 43564c181a7f58ce7471026bd0daa099344330e8 /app/views/api | |
| parent | fd81916e8625e5de39855522300eaeffd85ee13d (diff) | |
| parent | 99226aba9391535a20d3cc6dba0f45e5792c73d4 (diff) | |
Merge branch 'master' into fix/cache_blocking
Diffstat (limited to 'app/views/api')
| -rw-r--r-- | app/views/api/v1/statuses/_media.rabl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl index 2f56c6d07..80d80ea05 100644 --- a/app/views/api/v1/statuses/_media.rabl +++ b/app/views/api/v1/statuses/_media.rabl @@ -1,5 +1,5 @@ attributes :id, :remote_url, :type -node(:url) { |media| full_asset_url(media.file.url(:original)) } -node(:preview_url) { |media| full_asset_url(media.file.url(:small)) } +node(:url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:original)) } +node(:preview_url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:small)) } node(:text_url) { |media| media.local? ? medium_url(media) : nil } |