Merge branch 'main' into glitch-soc/merge-upstream

2021-03-19 13:57:15 +01:00
parent ba22398c38 741d0952b1
commit 3ad6ef72cb
63 changed files with 408 additions and 398 deletions
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -31,7 +31,9 @@ module CacheConcern
  def cache_collection(raw, klass)
    return raw unless klass.respond_to?(:with_includes)

-    raw                    = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
+    raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
+    return [] if raw.empty?
+
    cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id)
    uncached_ids           = raw.map(&:id) - cached_keys_with_value.keys