diff options
| author | shel <Yiskah.Raphen@gmail.com> | 2017-03-31 10:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 10:34:14 -0400 |
| commit | f20f6b25b98efffca47caae713f8dc5e1d0d4bd1 (patch) | |
| tree | 104152d4bd6f9889f38b2f46fee108185c3b29f7 /app/views/api/v1/statuses | |
| parent | 76188d61f2c3bb5747208df92835e912db18d7b6 (diff) | |
| parent | 680f9efe9c4aa7fce1f4dd6a35ef4aca7a80c1f3 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/views/api/v1/statuses')
| -rw-r--r-- | app/views/api/v1/statuses/_show.rabl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl index 059e0d13f..54e8a86d8 100644 --- a/app/views/api/v1/statuses/_show.rabl +++ b/app/views/api/v1/statuses/_show.rabl @@ -3,8 +3,8 @@ attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, :sensitiv node(:uri) { |status| TagManager.instance.uri_for(status) } node(:content) { |status| Formatter.instance.format(status) } node(:url) { |status| TagManager.instance.url_for(status) } -node(:reblogs_count) { |status| defined?(@reblogs_counts_map) ? (@reblogs_counts_map[status.id] || 0) : status.reblogs.count } -node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : status.favourites.count } +node(:reblogs_count) { |status| defined?(@reblogs_counts_map) ? (@reblogs_counts_map[status.id] || 0) : status.reblogs_count } +node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : status.favourites_count } child :application do extends 'api/v1/apps/show' |