gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

6
app/views/api/v1/accounts/show.rabl
View file

@ -5,6 +5,6 @@ attributes :id, :username, :acct, :display_name, :note
node(:url) { |account| TagManager.instance.url_for(account) }
node(:avatar) { |account| full_asset_url(account.avatar.url(:large, false)) }
node(:header) { |account| full_asset_url(account.header.url(:medium, false)) }
node(:followers_count) { |account| account.followers.count }
node(:following_count) { |account| account.following.count }
node(:statuses_count) { |account| account.statuses.count }
node(:followers_count) { |account| account.try(:followers_count) || account.followers.count }
node(:following_count) { |account| account.try(:following_count) || account.following.count }
node(:statuses_count) { |account| account.try(:statuses_count) || account.statuses.count }

4
app/views/api/v1/statuses/show.rabl
View file

@ -6,8 +6,8 @@ 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| current_account.favourited?(status) }
node(:reblogged, if: proc { !current_account.nil? }) { |status| current_account.reblogged?(status) }
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')