From 15ec4ae07b17821625bd2ca1088a7573a7ed128c Mon Sep 17 00:00:00 2001 From: Eugen Date: Mon, 17 Apr 2017 19:58:54 +0200 Subject: Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988) Also improve efficiency of the mastodon:maintenance:add_static_avatars task --- app/views/api/v1/statuses/_media.rabl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views') 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 } -- cgit