From e4671adc25081161268c885b3427fd84cbecb249 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 3 Nov 2016 14:50:22 +0100 Subject: Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status --- app/controllers/api/v1/statuses_controller.rb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 3db4dbbd0..a87e1528d 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 -- cgit