mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status

Browse Source
This commit is contained in:
Eugen Rochko 2016-11-03 14:50:22 +01:00
parent c003e70758
commit e4671adc25
5 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/api/v1/statuses_controller.rb
View File

@ -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]
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

3
app/views/api/v1/statuses/_show.rabl
View File

@ -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'

2
app/views/api/v1/statuses/accounts.rabl Normal file
View File

@ -0,0 +1,2 @@
collection @accounts
extends 'api/v1/accounts/show'

7
app/views/api/v1/statuses/show.rabl
View File

@ -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

2
config/routes.rb
View File

@ -59,6 +59,8 @@ Rails.application.routes.draw do
member do
get :context
get :reblogged_by
get :favourited_by
post :reblog
post :unreblog