From a8798ea4bd483ad137f17a145045d4ad77910cc0 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Fri, 15 Sep 2023 22:28:06 +0900
Subject: [PATCH] Merge enable_emoji_reaction account and server settings
---
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
index 7f8792d918..97f2a58092 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -48,7 +48,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:display_media] = object.current_account.user.setting_display_media
store[:display_media_expand] = object.current_account.user.setting_display_media_expand
store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
- store[:enable_emoji_reaction] = object.current_account.user.setting_enable_emoji_reaction
+ store[:enable_emoji_reaction] = object.current_account.user.setting_enable_emoji_reaction && Setting.enable_emoji_reaction
store[:show_emoji_reaction_on_timeline] = object.current_account.user.setting_show_emoji_reaction_on_timeline
store[:enable_login_privacy] = object.current_account.user.setting_enable_login_privacy
store[:enable_dtl_menu] = object.current_account.user.setting_enable_dtl_menu