diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-16 12:51:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 12:51:30 +0200 |
| commit | 5d710b1139b34f2ed6bd556f448fa7248354e758 (patch) | |
| tree | 958a5ff315699f13b4668f190c321291df06e29c /app/views/api | |
| parent | 8a58942c80275788cbe069f2d67c396732ec092d (diff) | |
Make file attachment on MediaAttachment optional (#1865)
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI
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 } |