vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into feature-limited-visibility-bearcaps

Browse source
This commit is contained in:
Takeshi Umeda 2021-01-10 11:17:55 +09:00 • committed by GitHub
commit 98a2603dc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
855 changed files with 32564 additions and 10102 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/concerns/cache_concern.rb
View file

@ -45,10 +45,10 @@ module CacheConcern
end
end
raw.map { |item| cached_keys_with_value[item.id] || uncached[item.id] }.compact
raw.filter_map { |item| cached_keys_with_value[item.id] || uncached[item.id] }
end
def cache_collection_paginated_by_id(raw, klass, limit, options)
cache_collection raw.cache_ids.paginate_by_id(limit, options), klass
cache_collection raw.cache_ids.to_a_paginated_by_id(limit, options), klass
end
end