]> cat aescling's git repositories - mastodon.git/commitdiff
Fix missing domain attribute in EntityCache for emoji (#7290)
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 30 Apr 2018 07:12:55 +0000 (09:12 +0200)
committerGitHub <noreply@github.com>
Mon, 30 Apr 2018 07:12:55 +0000 (09:12 +0200)
app/lib/entity_cache.rb

index 0c4edbfabc1b199f1eae6d7fc122792a85c5fdea..03bfb7cf0ba44366e0afe8deafbad7d20193b8d1 100644 (file)
@@ -21,7 +21,7 @@ class EntityCache
     end
 
     unless uncached_ids.empty?
-      uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).select(:shortcode, :id, :image_file_name, :visible_in_picker).map { |item| [item.shortcode, item] }.to_h
+      uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).select(:shortcode, :id, :domain, :image_file_name, :visible_in_picker).map { |item| [item.shortcode, item] }.to_h
       uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
     end