about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-03 13:59:31 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-03 13:59:31 +0100
commit562044f36ad8ebe388e32eef2e5d44bec4a9af59 (patch)
tree1e699f23aa961a63ed2911789c4d31a33e2e8aae /app/views
parent0160d1d9b5195e5d8fcb94b29f74634b129439b4 (diff)
Need to disable caching again due to bug in Rabl
Diffstat (limited to 'app/views')
-rw-r--r--app/views/api/v1/accounts/relationship.rabl1
-rw-r--r--app/views/api/v1/accounts/show.rabl2
-rw-r--r--app/views/api/v1/statuses/context.rabl15
-rw-r--r--app/views/api/v1/statuses/show.rabl2
4 files changed, 9 insertions, 11 deletions
diff --git a/app/views/api/v1/accounts/relationship.rabl b/app/views/api/v1/accounts/relationship.rabl
index 3e5bf882c..4f634877f 100644
--- a/app/views/api/v1/accounts/relationship.rabl
+++ b/app/views/api/v1/accounts/relationship.rabl
@@ -1,4 +1,5 @@
 object @account
+cache false
 attribute :id
 node(:following)   { |account| @following[account.id]   || false }
 node(:followed_by) { |account| @followed_by[account.id] || false }
diff --git a/app/views/api/v1/accounts/show.rabl b/app/views/api/v1/accounts/show.rabl
index 08199ec21..6aec6e14d 100644
--- a/app/views/api/v1/accounts/show.rabl
+++ b/app/views/api/v1/accounts/show.rabl
@@ -1,5 +1,5 @@
 object @account
-cache @account
+cache false
 
 attributes :id, :username, :acct, :display_name, :note
 
diff --git a/app/views/api/v1/statuses/context.rabl b/app/views/api/v1/statuses/context.rabl
index e9176dc29..24fa40394 100644
--- a/app/views/api/v1/statuses/context.rabl
+++ b/app/views/api/v1/statuses/context.rabl
@@ -1,13 +1,10 @@
-object false
+object @context
+cache false
 
-node :ancestors do
-  @ancestors.map do |status|
-    partial('api/v1/statuses/show', object: status)
-  end
+node :ancestors do |context|
+  partial 'api/v1/statuses/index', object: context.ancestors
 end
 
-node :descendants do
-  @descendants.map do |status|
-    partial('api/v1/statuses/show', object: status)
-  end
+node :descendants do |context|
+  partial 'api/v1/statuses/index', object: context.descendants
 end
diff --git a/app/views/api/v1/statuses/show.rabl b/app/views/api/v1/statuses/show.rabl
index f78716e1b..24493bc3e 100644
--- a/app/views/api/v1/statuses/show.rabl
+++ b/app/views/api/v1/statuses/show.rabl
@@ -1,5 +1,5 @@
 object @status
-cache @status
+cache false
 
 extends 'api/v1/statuses/_show'