diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-27 16:26:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 16:26:18 +0100 |
| commit | 33be091f506242b136b0d4a65cf06a0babc4d757 (patch) | |
| tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /app/lib/entity_cache.rb | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (diff) | |
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/entity_cache.rb')
| -rw-r--r-- | app/lib/entity_cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb index 2aa37389c..8fff544a0 100644 --- a/app/lib/entity_cache.rb +++ b/app/lib/entity_cache.rb @@ -21,7 +21,7 @@ class EntityCache end unless uncached_ids.empty? - uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).map { |item| [item.shortcode, item] }.to_h + uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).each_with_object({}) { |item, h| h[item.shortcode] = item } uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) } end |