about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-05 19:26:24 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-05 19:26:24 +0200
commit14fb0ab4a2835b0af6f3f5480afa33c1ae992273 (patch)
treed397947d63cbceaae0b12c37ce588a2cfc962b8e /app
parented94e998bcd8b952dbd6052309bdf5650b29be4f (diff)
Improve JSON output for media attachments, generate :small preview for them
Diffstat (limited to 'app')
-rw-r--r--app/models/media_attachment.rb2
-rw-r--r--app/views/api/statuses/show.rabl5
2 files changed, 5 insertions, 2 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 835287ac9..1f51e3d13 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -2,7 +2,7 @@ class MediaAttachment < ApplicationRecord
   belongs_to :account, inverse_of: :media_attachments
   belongs_to :status,  inverse_of: :media_attachments
 
-  has_attached_file :file
+  has_attached_file :file, styles: { small: '510x680>' }
   validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
 
   validates :account, presence: true
diff --git a/app/views/api/statuses/show.rabl b/app/views/api/statuses/show.rabl
index b8cf075fe..21e054453 100644
--- a/app/views/api/statuses/show.rabl
+++ b/app/views/api/statuses/show.rabl
@@ -17,6 +17,9 @@ child :account do
   extends('api/accounts/show')
 end
 
-child :media_attachments do
+child :media_attachments, object_root: false do
+  attribute :remote_url
+
   node(:url) { |media| full_asset_url(media.file.url) }
+  node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
 end