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

2021-01-18 13:57:12 +01:00
parent a7a47834e5 e46b50e805
commit e202314a75
18 changed files with 48 additions and 43 deletions
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@ -326,7 +326,7 @@ module Mastodon
      end

      preload_map.each_with_object({}) do |(model_name, record_ids), model_map|
-        model_map[model_name] = model_name.constantize.where(id: record_ids).each_with_object({}) { |record, record_map| record_map[record.id] = record }
+        model_map[model_name] = model_name.constantize.where(id: record_ids).index_by(&:id)
      end
    end
  end