From 1f650d327d35bc48b897da99914c43750d8e5fd3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Oct 2016 16:00:11 +0200
Subject: Adding public timeline

---
 app/views/api/v1/statuses/home.rabl     | 2 --
 app/views/api/v1/statuses/index.rabl    | 2 ++
 app/views/api/v1/statuses/mentions.rabl | 2 --
 app/views/api/v1/statuses/show.rabl     | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 app/views/api/v1/statuses/home.rabl
 create mode 100644 app/views/api/v1/statuses/index.rabl
 delete mode 100644 app/views/api/v1/statuses/mentions.rabl

(limited to 'app/views/api/v1')

diff --git a/app/views/api/v1/statuses/home.rabl b/app/views/api/v1/statuses/home.rabl
deleted file mode 100644
index 0a0ed13c5..000000000
--- a/app/views/api/v1/statuses/home.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @statuses
-extends('api/v1/statuses/show')
diff --git a/app/views/api/v1/statuses/index.rabl b/app/views/api/v1/statuses/index.rabl
new file mode 100644
index 000000000..0a0ed13c5
--- /dev/null
+++ b/app/views/api/v1/statuses/index.rabl
@@ -0,0 +1,2 @@
+collection @statuses
+extends('api/v1/statuses/show')
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')
-- 
cgit