Fix: ローカルサーバーのスタンプ利用可否が正しく反映できない問題 (#219)
* Fix: ローカルサーバーのスタンプ利用可否が正しく反映できない問題 * 不要な分岐を削除 * Fix: Presenterの使用を中止(どうせキャッシュしてるので)
This commit is contained in:
parent
86afcdbc4d
commit
37779910df
3 changed files with 3 additions and 9 deletions
|
@ -33,8 +33,6 @@ class InstanceInfo < ApplicationRecord
|
|||
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?
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ class StatusRelationshipsPresenter
|
|||
@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 @@ class StatusRelationshipsPresenter
|
|||
@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
|
||||
|
|
|
@ -167,11 +167,9 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
|||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue