logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c003e7075880071743af06cfb5865bdb943db024
parent: 562044f36ad8ebe388e32eef2e5d44bec4a9af59
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu,  3 Nov 2016 14:12:45 +0100

Caching should work correctly now (fingers crossed)

Diffstat:

Mapp/views/api/v1/accounts/relationship.rabl2+-
Mapp/views/api/v1/accounts/show.rabl2+-
Mapp/views/api/v1/statuses/context.rabl1-
Mapp/views/api/v1/statuses/show.rabl2+-
4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/api/v1/accounts/relationship.rabl b/app/views/api/v1/accounts/relationship.rabl @@ -1,5 +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 @@ -1,5 +1,5 @@ object @account -cache false +cache 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 @@ -1,5 +1,4 @@ object @context -cache false node :ancestors do |context| partial 'api/v1/statuses/index', object: context.ancestors diff --git a/app/views/api/v1/statuses/show.rabl b/app/views/api/v1/statuses/show.rabl @@ -1,5 +1,5 @@ object @status -cache false +cache extends 'api/v1/statuses/_show'