diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-05-12 22:03:43 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-13 04:03:43 +0200 |
| commit | 3dcb5fa28f13f597d49b5b442f61d12bc2be6152 (patch) | |
| tree | 50d9b18404756964d7c368e6d79562be478a61f4 /app/views/api | |
| parent | 1d5dcfcd46b973791c4f19f1dd66f33f3498800a (diff) | |
Revert HTML CW changes (#3020)
* selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
Diffstat (limited to 'app/views/api')
| -rw-r--r-- | app/views/api/v1/statuses/_show.rabl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl index 33bf39458..54e8a86d8 100644 --- a/app/views/api/v1/statuses/_show.rabl +++ b/app/views/api/v1/statuses/_show.rabl @@ -1,8 +1,7 @@ -attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, :sensitive, :visibility +attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, :sensitive, :spoiler_text, :visibility node(:uri) { |status| TagManager.instance.uri_for(status) } node(:content) { |status| Formatter.instance.format(status) } -node(:spoiler_text) { |status| Formatter.instance.format(status, :spoiler_text, false) } 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 } |