autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unify collection caching code

Browse Source
This commit is contained in:
Eugen Rochko
2016-11-29 15:49:39 +01:00
parent 93a90cd9c3
commit 7e90772c92
6 changed files with 30 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/controllers/api/v1/timelines_controller.rb
View File

@ -8,6 +8,7 @@ class Api::V1::TimelinesController < ApiController
def home
@statuses = Feed.new(:home, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
@ -23,6 +24,7 @@ class Api::V1::TimelinesController < ApiController
def mentions
@statuses = Feed.new(:mentions, current_account).get(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]).to_a
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
@ -38,7 +40,7 @@ class Api::V1::TimelinesController < ApiController
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 = cache(@statuses)
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
@ -55,7 +57,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 = cache(@statuses)
@statuses = cache_collection(@statuses)
set_maps(@statuses)
set_counters_maps(@statuses)
@ -71,22 +73,7 @@ class Api::V1::TimelinesController < ApiController
private
def cache(raw)
uncached_ids = []
cached_keys_with_value = Rails.cache.read_multi(*raw.map(&:cache_key))
raw.each do |status|
uncached_ids << status.id unless cached_keys_with_value.key?(status.cache_key)
end
unless uncached_ids.empty?
uncached = Status.where(id: uncached_ids).with_includes.map { |s| [s.id, s] }.to_h
uncached.values.each do |status|
Rails.cache.write(status.cache_key, status)
end
end
raw.map { |status| cached_keys_with_value[status.cache_key] || uncached[status.id] }.compact
def cache_collection(raw)
super(raw, Status)
end
end