about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorFrancis Chong <francis@ignition.hk>2017-04-26 09:48:12 +0800
committerEugen Rochko <eugen@zeonfederated.com>2017-04-26 03:48:12 +0200
commit193dddb433f27cc61e1977148cbd01d61bb87fbf (patch)
tree1e99680980a3c294b5296e79ab9fbc1dafcd0f13 /app/views
parent8fe36654efff73cb9b6800f7d1a57e6466f2ded3 (diff)
Add media dimensions (#2448)
* Fixes #1985

- add migration AddMediaAttachmentMeta, which add meta field to media_attachments
- before saving attachment, set file meta if needed
- add meta in api

* add spec

* align the “size” format for image and video

* fix code climate

* fixes media_attachment_spec.rb
Diffstat (limited to 'app/views')
-rw-r--r--app/views/api/v1/statuses/_media.rabl1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl
index 2f56c6d07..bcba78c95 100644
--- a/app/views/api/v1/statuses/_media.rabl
+++ b/app/views/api/v1/statuses/_media.rabl
@@ -3,3 +3,4 @@ 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(:text_url)    { |media| media.local? ? medium_url(media) : nil }
+node(:meta)       { |media| media.file.meta }
\ No newline at end of file