Merge 6eeb9215b6 into 7d2dda97b3

.github/ISSUE_TEMPLATE/1.web_bug_report.yml

@@ -1,6 +1,6 @@
 name: Bug Report (Web Interface)
 description: There is a problem using Mastodon's web interface.
-labels: ['status/to triage', 'area/web interface']
+labels: ['area/web interface']
 type: Bug
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/2.server_bug_report.yml

@@ -1,7 +1,6 @@
 name: Bug Report (server / API)
 description: |
   There is a problem with the HTTP server, REST API, ActivityPub interaction, etc.
-labels: ['status/to triage']
 type: 'Bug'
 body:
   - type: markdown

app/lib/entity_cache.rb

@@ -19,24 +19,30 @@ class EntityCache
     shortcodes = Array(shortcodes)
     return [] if shortcodes.empty?
 
-    cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_key(:emoji, shortcode, domain) })
+    domain = domain.downcase if domain
+
+    cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_emoji(:emoji, shortcode, domain) })
     uncached_ids = []
 
     shortcodes.each do |shortcode|
-      uncached_ids << shortcode unless cached.key?(to_key(:emoji, shortcode, domain))
+      uncached_ids << shortcode unless cached.key?(to_emoji(:emoji, shortcode, domain))
     end
 
     if uncached_ids.empty?
       uncached = {}
     else
       uncached = CustomEmoji.enabled.where(shortcode: shortcodes, domain: domain).index_by(&:shortcode)
-      uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
+      uncached.each_value { |item| Rails.cache.write(to_emoji(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
     end
 
-    shortcodes.filter_map { |shortcode| cached[to_key(:emoji, shortcode, domain)] || uncached[shortcode] }
+    shortcodes.filter_map { |shortcode| cached[to_emoji(:emoji, shortcode, domain)] || uncached[shortcode] }
   end
 
   def to_key(type, *ids)
     "#{type}:#{ids.compact.map(&:downcase).join(':')}"
   end
+
+  def to_emoji(type, *ids)
+    "#{type}:#{ids.compact.join(':')}"
+  end
 end

spec/lib/entity_cache_spec.rb

@@ -18,4 +18,12 @@ RSpec.describe EntityCache do
       end
     end
   end
+
+  describe '#to_emoji' do
+    context 'when input shortcode has cases' do
+      it 'returns emoji with cases preserved' do
+        expect(described_class.instance.to_emoji(:emoji, 'FooBar', 'example.org')).to eq 'emoji:FooBar:example.org'
+      end
+    end
+  end
 end