hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

signup-info-prompt
Eugen Rochko 2016-09-05 19:26:24 +02:00
parent ed94e998bc
commit 14fb0ab4a2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/media_attachment.rb
View File

@ -2,7 +2,7 @@ class MediaAttachment < ApplicationRecord
belongs_to :account, inverse_of: :media_attachments belongs_to :account, inverse_of: :media_attachments
belongs_to :status, 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_attachment_content_type :file, content_type: /\Aimage\/.*\z/
validates :account, presence: true validates :account, presence: true

5
app/views/api/statuses/show.rabl
View File

@ -17,6 +17,9 @@ child :account do
extends('api/accounts/show') extends('api/accounts/show')
end 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(:url) { |media| full_asset_url(media.file.url) }
node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
end end