Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix pt translations, improve pre-cache queries, removing will_paginate

Browse source 
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
This commit is contained in:
Eugen Rochko 2016-12-01 16:26:25 +01:00
parent bdf7d8f8fd
commit 1d0321fc45
10 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/accounts_controller.rb
View file

@ -9,7 +9,8 @@ class AccountsController < ApplicationController
def show
respond_to do |format|
format.html do
@statuses = @account.statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)
@statuses = @account.statuses.order('id desc').paginate_by_max_id(20, params[:max_id || nil])
@statuses = cache_collection(@statuses, Status)
end
format.atom do
@ -29,11 +30,11 @@ class AccountsController < ApplicationController
end
def followers
@followers = @account.followers.order('follows.created_at desc').paginate(page: params[:page], per_page: 6)
@followers = @account.followers.order('follows.created_at desc').paginate(page: params[:page], per_page: 12)
end
def following
@following = @account.following.order('follows.created_at desc').paginate(page: params[:page], per_page: 6)
@following = @account.following.order('follows.created_at desc').paginate(page: params[:page], per_page: 12)
end
private

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

@ -47,7 +47,7 @@ class Api::V1::AccountsController < ApiController
end
def statuses
@statuses = @account.statuses.paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = @account.statuses.paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses, Status)
set_maps(@statuses)

8
app/controllers/api/v1/timelines_controller.rb
View file

@ -7,7 +7,7 @@ class Api::V1::TimelinesController < ApiController
respond_to :json
def home
@statuses = Feed.new(:home, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = Feed.new(:home, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
@ -23,7 +23,7 @@ class Api::V1::TimelinesController < ApiController
end
def mentions
@statuses = Feed.new(:mentions, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = Feed.new(:mentions, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
@ -39,7 +39,7 @@ class Api::V1::TimelinesController < ApiController
end
def public
@statuses = Status.as_public_timeline(current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = Status.as_public_timeline(current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)
@ -56,7 +56,7 @@ class Api::V1::TimelinesController < ApiController
def tag
@tag = Tag.find_by(name: params[:id].downcase)
@statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id])
@statuses = cache_collection(@statuses)
set_maps(@statuses)

1
app/controllers/application_controller.rb
View file

@ -61,6 +61,7 @@ class ApplicationController < ActionController::Base
def cache_collection(raw, klass)
return raw unless klass.respond_to?(:with_includes)
raw = raw.select(:id, :updated_at).to_a if raw.is_a?(ActiveRecord::Relation)
uncached_ids = []
cached_keys_with_value = Rails.cache.read_multi(*raw.map(&:cache_key))

3
app/controllers/tags_controller.rb
View file

@ -4,6 +4,7 @@ class TagsController < ApplicationController
layout 'public'
def show
@statuses = Tag.find_by!(name: params[:id].downcase).statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)
@statuses = Tag.find_by!(name: params[:id].downcase).statuses.order('id desc').paginate_by_max_id(20, params[:max_id] || nil)
@statuses = cache_collection(@statuses, Status)
end
end