Fix: ローカルサーバーのスタンプ利用可否が正しく反映できない問題 (#219)

* Fix: ローカルサーバーのスタンプ利用可否が正しく反映できない問題 * 不要な分岐を削除 * Fix: Presenterの使用を中止（どうせキャッシュしてるので）
kmycode · Nov 2, 2023 · 3777991 · 3777991
1 parent 86afcdb
commit 3777991
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/app/models/instance_info.rb b/app/models/instance_info.rb
@@ -33,8 +33,6 @@ def self.emoji_reaction_available?(domain)
   end
 
   def self.fetch_emoji_reaction_available(domain)
-    return Setting.enable_emoji_reaction if domain.nil?
-
     info = InstanceInfo.find_by(domain: domain)
     return false if info.nil?
 

diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
@@ -19,7 +19,6 @@ def initialize(statuses, current_account_id = nil, **options)
       @pins_map            = {}
       @filters_map         = {}
       @emoji_reaction_allows_map = nil
-      @emoji_reaction_availables_map = {}
     else
       statuses = statuses.compact
       statuses += statuses.filter_map(&:quote)
@@ -36,7 +35,6 @@ def initialize(statuses, current_account_id = nil, **options)
       @domain_blocks_map = Status.domain_blocks_map(statuses.filter_map { |status| status.account.domain }.uniq, current_account_id).merge(options[:domain_blocks_map] || {})
       @pins_map          = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
       @emoji_reaction_allows_map = Status.emoji_reaction_allows_map(status_ids, current_account_id).merge(options[:emoji_reaction_allows_map] || {})
-      @emoji_reaction_availables_map = Status.emoji_reaction_availables_map(statuses.filter_map { |status| status.account.domain }.uniq).merge(options[:emoji_reaction_availables_map] || {})
       @attributes_map = options[:attributes_map] || {}
     end
   end

diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
@@ -167,11 +167,9 @@ def show_emoji_reaction?
   end
 
   def emoji_reaction_available_server
-    if relationships
-      relationships.emoji_reaction_availables_map[object.account.domain] || false
-    else
-      InstanceInfo.emoji_reaction_available?(object.account.domain)
-    end
+    return Setting.enable_emoji_reaction if object.local?
+
+    InstanceInfo.emoji_reaction_available?(object.account.domain)
   end
 
   def reactions