about summary refs log tree commit diff
path: root/app/views/api
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/api')
-rw-r--r--app/views/api/v1/statuses/index.rabl (renamed from app/views/api/v1/statuses/home.rabl)0
-rw-r--r--app/views/api/v1/statuses/mentions.rabl2
-rw-r--r--app/views/api/v1/statuses/show.rabl4
3 files changed, 2 insertions, 4 deletions
diff --git a/app/views/api/v1/statuses/home.rabl b/app/views/api/v1/statuses/index.rabl
index 0a0ed13c5..0a0ed13c5 100644
--- a/app/views/api/v1/statuses/home.rabl
+++ b/app/views/api/v1/statuses/index.rabl
diff --git a/app/views/api/v1/statuses/mentions.rabl b/app/views/api/v1/statuses/mentions.rabl
deleted file mode 100644
index 0a0ed13c5..000000000
--- a/app/views/api/v1/statuses/mentions.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @statuses
-extends('api/v1/statuses/show')
diff --git a/app/views/api/v1/statuses/show.rabl b/app/views/api/v1/statuses/show.rabl
index 3595bafb4..20cb65e29 100644
--- a/app/views/api/v1/statuses/show.rabl
+++ b/app/views/api/v1/statuses/show.rabl
@@ -6,8 +6,8 @@ node(:content)          { |status| Formatter.instance.format(status) }
 node(:url)              { |status| TagManager.instance.url_for(status) }
 node(:reblogs_count)    { |status| status.reblogs_count }
 node(:favourites_count) { |status| status.favourites_count }
-node(:favourited)       { |status| current_account.favourited?(status) }
-node(:reblogged)        { |status| current_account.reblogged?(status) }
+node(:favourited, if: proc { !current_account.nil? }) { |status| current_account.favourited?(status) }
+node(:reblogged,  if: proc { !current_account.nil? }) { |status| current_account.reblogged?(status) }
 
 child :reblog => :reblog do
   extends('api/v1/statuses/show')