Improve JSON output for media attachments, generate :small preview for them

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 835287ac9e818697e8c10b9e3f44ed9082139d72..1f51e3d13aebe57b568032b8429f5fe59def23c4 100644 (file)
--- 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 b8cf075fefc64730e73db63b05ba135a33e33ca8..21e054453c6592eeb5cb5000f17e751d71080ea2 100644 (file)
--- 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