]> cat aescling's git repositories - mastodon.git/commitdiff
Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)
authorkedama <32974885+kedamaDQ@users.noreply.github.com>
Tue, 7 Nov 2017 13:24:21 +0000 (22:24 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 7 Nov 2017 13:24:21 +0000 (14:24 +0100)
Make the same behavior as /api/v1/custom_emojis.

app/serializers/initial_state_serializer.rb

index a8db7316172586f0333823396e3e93299af57f5f..4fa1981ed40d80f99a53eda7d2f3ed966f806148 100644 (file)
@@ -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