logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 9ea4f37e782b2c98e0f4906883841bbc6d39fadf
parent: c48772fd3f12fac1ee28c8cfc521daedcb4d26c9
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 26 May 2017 18:22:30 +0200

Add "meta" attribute to return of POST /api/v1/media method as well (#3333)


Diffstat:

Mapp/views/api/v1/media/create.rabl6++++--
Mapp/views/api/v1/statuses/_media.rabl3+--
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 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 @@ -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 }