diff options
| author | halna_Tanaguru <fhalna@oceaneconsulting.com> | 2017-04-04 12:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 12:06:53 +0200 |
| commit | 3abb0f7bc708ae8ca387aee8560b9558f8b209ba (patch) | |
| tree | 6014fdec3201d9e40fa244b821bdaffc83bfa131 /app/views/api/v1/statuses/_show.rabl | |
| parent | 3f30ae1f97717177f29711d5b99d7970c6b75b3e (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'app/views/api/v1/statuses/_show.rabl')
| -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 f384b6d14..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.try(:reblogs_count) || status.reblogs.count) } -node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : (status.try(:favourites_count) || 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' |