about summary refs log tree commit diff
path: root/app/views/api
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-26 18:22:30 +0200
committerGitHub <noreply@github.com>2017-05-26 18:22:30 +0200
commit9ea4f37e782b2c98e0f4906883841bbc6d39fadf (patch)
tree7a02a443bc819e43eec739675c5c6a13026b2afb /app/views/api
parentc48772fd3f12fac1ee28c8cfc521daedcb4d26c9 (diff)
Add "meta" attribute to return of POST /api/v1/media method as well (#3333)
Diffstat (limited to 'app/views/api')
-rw-r--r--app/views/api/v1/media/create.rabl6
-rw-r--r--app/views/api/v1/statuses/_media.rabl2
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/api/v1/media/create.rabl b/app/views/api/v1/media/create.rabl
index 916217cbd..53c13bbda 100644
--- a/app/views/api/v1/media/create.rabl
+++ b/app/views/api/v1/media/create.rabl
@@ -1,5 +1,7 @@
 object @media
 attribute :id, :type
-node(:url) { |media| full_asset_url(media.file.url(:original)) }
+
+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| medium_url(media) }
+node(:text_url)    { |media| medium_url(media) }
+node(:meta)        { |media| media.file.meta }
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl
index bcba78c95..07ac31888 100644
--- a/app/views/api/v1/statuses/_media.rabl
+++ b/app/views/api/v1/statuses/_media.rabl
@@ -3,4 +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
+node(:meta)        { |media| media.file.meta }