diff options
| -rw-r--r-- | app/views/api/accounts/show.rabl | 11 | ||||
| -rw-r--r-- | app/views/api/follows/show.rabl | 7 | ||||
| -rw-r--r-- | app/views/api/statuses/show.rabl | 14 |
3 files changed, 15 insertions, 17 deletions
diff --git a/app/views/api/accounts/show.rabl b/app/views/api/accounts/show.rabl index e4c4883c8..df70943dd 100644 --- a/app/views/api/accounts/show.rabl +++ b/app/views/api/accounts/show.rabl @@ -2,8 +2,9 @@ object @account attributes :id, :username, :acct, :display_name, :note -node(:url) { |account| url_for_target(account) } -node(:avatar) { |account| asset_url(account.avatar.url(:large, false)) } -node(:followers) { |account| account.followers.count } -node(:following) { |account| account.following.count } -node(:statuses) { |account| account.statuses.count } +node(:url) { |account| url_for_target(account) } +node(:avatar) { |account| asset_url(account.avatar.url(:large, false)) } +node(:followers_count) { |account| account.followers.count } +node(:following_count) { |account| account.following.count } +node(:statuses_count) { |account| account.statuses.count } +node(:following) { |account| current_user.account.following?(account) } diff --git a/app/views/api/follows/show.rabl b/app/views/api/follows/show.rabl index 38c3424da..e5b52b828 100644 --- a/app/views/api/follows/show.rabl +++ b/app/views/api/follows/show.rabl @@ -1,5 +1,2 @@ -object @follow - -child :target_account => :target_account do - extends('api/accounts/show') -end +object @follow.target_account +extends('api/accounts/show') diff --git a/app/views/api/statuses/show.rabl b/app/views/api/statuses/show.rabl index 344517236..83377e0e8 100644 --- a/app/views/api/statuses/show.rabl +++ b/app/views/api/statuses/show.rabl @@ -1,13 +1,13 @@ object @status attributes :id, :created_at, :in_reply_to_id -node(:uri) { |status| uri_for_target(status) } -node(:content) { |status| status.local? ? linkify(status) : status.content } -node(:url) { |status| url_for_target(status) } -node(:reblogs) { |status| status.reblogs.count } -node(:favourites) { |status| status.favourites.count } -node(:favourited) { |status| current_user.account.favourited?(status) } -node(:reblogged) { |status| current_user.account.reblogged?(status) } +node(:uri) { |status| uri_for_target(status) } +node(:content) { |status| status.local? ? linkify(status) : status.content } +node(:url) { |status| url_for_target(status) } +node(:reblogs_count) { |status| status.reblogs.count } +node(:favourites_count) { |status| status.favourites.count } +node(:favourited) { |status| current_user.account.favourited?(status) } +node(:reblogged) { |status| current_user.account.reblogged?(status) } child :reblog => :reblog do extends('api/statuses/show') |