Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into mastodon-site-api

Browse source
This commit is contained in:
Eugen 2017-03-15 22:55:22 +01:00 • committed by GitHub
commit e245115f47
109 changed files with 1572 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/views/api/v1/accounts/relationship.rabl
View file

@ -4,4 +4,5 @@ attribute :id
node(:following) { |account| @following[account.id] || false }
node(:followed_by) { |account| @followed_by[account.id] || false }
node(:blocking) { |account| @blocking[account.id] || false }
node(:muting) { |account| @muting[account.id] || false }
node(:requested) { |account| @requested[account.id] || false }

4
app/views/api/v1/media/create.rabl
View file

@ -1,5 +1,5 @@
object @media
attribute :id, :type
node(:url) { |media| full_asset_url(media.file.url( :original)) }
node(:preview_url) { |media| full_asset_url(media.file.url( :small)) }
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) }

2
app/views/api/v1/mutes/index.rabl Normal file
View file

@ -0,0 +1,2 @@
collection @accounts
extends 'api/v1/accounts/show'