From: kedama <32974885+kedamaDQ@users.noreply.github.com>
Date: Tue, 7 Nov 2017 13:24:21 +0000 (+0900)
Subject: Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d8cd9000d91aaebfa15865d0bcdfac4b59d3950f;p=mastodon.git

Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)

Make the same behavior as /api/v1/custom_emojis.
---

diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index a8db73161..4fa1981ed 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -7,7 +7,7 @@ class InitialStateSerializer < ActiveModel::Serializer
   has_many :custom_emojis, serializer: REST::CustomEmojiSerializer
 
   def custom_emojis
-    CustomEmoji.local
+    CustomEmoji.local.where(disabled: false)
   end
 
   def meta