about summary refs log tree commit diff
path: root/app/views/api/v1
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-17 19:58:54 +0200
committerGitHub <noreply@github.com>2017-04-17 19:58:54 +0200
commit15ec4ae07b17821625bd2ca1088a7573a7ed128c (patch)
treeeca4d800f150d90bf3930f500ffa96eb8807b74a /app/views/api/v1
parente43071a2f94354e54816b455e10cc596205af605 (diff)
Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)
Also improve efficiency of the mastodon:maintenance:add_static_avatars task
Diffstat (limited to 'app/views/api/v1')
-rw-r--r--app/views/api/v1/statuses/_media.rabl4
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 80d80ea05..2f56c6d07 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| 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(:url)         { |media| full_asset_url(media.file.url(:original)) }
+node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
 node(:text_url)    { |media| media.local? ? medium_url(media) : nil }