about summary refs log tree commit diff
path: root/app/lib/entity_cache.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-09-01 17:36:30 +0200
committerGitHub <noreply@github.com>2020-09-01 17:36:30 +0200
commitd967251fdc3826ad27d30e55258cfa4cdfd7c871 (patch)
tree91926ccaedf470bfef058cc7156f9f362d46186a /app/lib/entity_cache.rb
parentd95dd3883e0c7d1626f5e3b88d24af2627a641e2 (diff)
parent787a629b8f1df4cce53a9de7f3aa668cc9ef632f (diff)
Merge pull request #1417 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/entity_cache.rb')
-rw-r--r--app/lib/entity_cache.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index afdbd70f2..89cbf8d2c 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -16,7 +16,7 @@ class EntityCache
   end
 
   def emoji(shortcodes, domain)
-    shortcodes   = [shortcodes] unless shortcodes.is_a?(Array)
+    shortcodes   = Array(shortcodes)
     cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_key(:emoji, shortcode, domain) })
     uncached_ids = []