From e4671adc25081161268c885b3427fd84cbecb249 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 3 Nov 2016 14:50:22 +0100 Subject: [PATCH] Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status --- app/controllers/api/v1/statuses_controller.rb | 22 ++++++++++++++++--- app/views/api/v1/statuses/_show.rabl | 3 +-- app/views/api/v1/statuses/accounts.rabl | 2 ++ app/views/api/v1/statuses/show.rabl | 7 +++++- config/routes.rb | 2 ++ 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 app/views/api/v1/statuses/accounts.rabl diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 3db4dbbd00..a87e1528de 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -2,18 +2,28 @@ class Api::V1::StatusesController < ApiController before_action -> { doorkeeper_authorize! :read }, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite] before_action -> { doorkeeper_authorize! :write }, only: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite] - respond_to :json + before_action :set_status, only: [:show, :context, :reblogged_by, :favourited_by] + + respond_to :json def show - @status = Status.find(params[:id]) end def context - @status = Status.find(params[:id]) @context = OpenStruct.new({ ancestors: @status.ancestors, descendants: @status.descendants }) set_maps([@status] + @context[:ancestors] + @context[:descendants]) end + def reblogged_by + @accounts = @status.reblogs.includes(:account).limit(40).map(&:account) + render action: :accounts + end + + def favourited_by + @accounts = @status.favourites.includes(:account).limit(40).map(&:account) + render action: :accounts + end + def create @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), params[:media_ids]) render action: :show @@ -63,4 +73,10 @@ class Api::V1::StatusesController < ApiController set_maps(@statuses) render action: :index end + + private + + def set_status + @status = Status.find(params[:id]) + end end diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl index 8e7cd97eed..b105a114b1 100644 --- a/app/views/api/v1/statuses/_show.rabl +++ b/app/views/api/v1/statuses/_show.rabl @@ -1,3 +1,4 @@ +cache attributes :id, :created_at, :in_reply_to_id node(:uri) { |status| TagManager.instance.uri_for(status) } @@ -5,8 +6,6 @@ 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, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? !!@favourites_map[status.id] : current_account.favourited?(status) } -node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? !!@reblogs_map[status.id] : current_account.reblogged?(status) } child :account do extends 'api/v1/accounts/show' diff --git a/app/views/api/v1/statuses/accounts.rabl b/app/views/api/v1/statuses/accounts.rabl new file mode 100644 index 0000000000..9f3b13a53d --- /dev/null +++ b/app/views/api/v1/statuses/accounts.rabl @@ -0,0 +1,2 @@ +collection @accounts +extends 'api/v1/accounts/show' diff --git a/app/views/api/v1/statuses/show.rabl b/app/views/api/v1/statuses/show.rabl index 1c586a3a5a..1b4651cdd9 100644 --- a/app/views/api/v1/statuses/show.rabl +++ b/app/views/api/v1/statuses/show.rabl @@ -1,8 +1,13 @@ object @status -cache extends 'api/v1/statuses/_show' +node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? !!@favourites_map[status.id] : current_account.favourited?(status) } +node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? !!@reblogs_map[status.id] : current_account.reblogged?(status) } + child :reblog => :reblog do extends 'api/v1/statuses/_show' + + node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? !!@favourites_map[status.id] : current_account.favourited?(status) } + node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? !!@reblogs_map[status.id] : current_account.reblogged?(status) } end diff --git a/config/routes.rb b/config/routes.rb index 9344c99eac..8f9f737051 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -59,6 +59,8 @@ Rails.application.routes.draw do member do get :context + get :reblogged_by + get :favourited_by post :reblog post :unreblog