mastofe

commit: d8cd9000d91aaebfa15865d0bcdfac4b59d3950f
parent: d307ee79e9b2f783fbdc6fd2e174ec91c47e8e5e
Author: kedama <32974885+kedamaDQ@users.noreply.github.com>
Date:   Tue,  7 Nov 2017 22:24:21 +0900

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

Make the same behavior as /api/v1/custom_emojis.
Diffstat:
M
app/serializers/initial_state_serializer.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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