Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix #16 - Optimize n+1 queries when checking reblogged/favourited values for status lists in API

Browse source
This commit is contained in:
Eugen Rochko 2016-10-16 18:57:54 +02:00
parent 1de2833f30
commit de1f3aab86
8 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/api/v1/accounts_controller.rb
View file

@ -25,6 +25,7 @@ class Api::V1::AccountsController < ApiController
def statuses
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
end
def follow
@ -53,7 +54,7 @@ class Api::V1::AccountsController < ApiController
def relationships
ids = params[:id].is_a?(Enumerable) ? params[:id].map(&:to_i) : [params[:id].to_i]
@accounts = Account.find(ids)
@accounts = Account.where(id: ids).select('id')
@following = Account.following_map(ids, current_user.account_id)
@followed_by = Account.followed_by_map(ids, current_user.account_id)
@blocking = Account.blocking_map(ids, current_user.account_id)

4
app/controllers/api/v1/statuses_controller.rb
View file

@ -10,6 +10,7 @@ class Api::V1::StatusesController < ApiController
@status = Status.find(params[:id])
@ancestors = @status.ancestors
@descendants = @status.descendants
set_maps([@status] + @ancestors + @descendants)
end
def create
@ -46,16 +47,19 @@ class Api::V1::StatusesController < ApiController
def home
@statuses = Feed.new(:home, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
render action: :index
end
def mentions
@statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
render action: :index
end
def public
@statuses = Status.as_public_timeline(current_user.account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
set_maps(@statuses)
render action: :index
end
end

6
app/controllers/api_controller.rb
View file

@ -35,4 +35,10 @@ class ApiController < ApplicationController
def render_empty
render json: {}, status: 200
end
def set_maps(statuses)
status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.compact
@reblogs_map = Status.reblogs_map(status_ids, current_user.account)
@favourites_map = Status.favourites_map(status_ids, current_user.account)
end
end