gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

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

* 不要な分岐を削除

* Fix: Presenterの使用を中止（どうせキャッシュしてるので）
This commit is contained in:
KMY（雪あすか） 2023-11-02 13:56:26 +09:00 • committed by GitHub
parent 86afcdbc4d
commit 37779910df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/instance_info.rb
View file

@ -33,8 +33,6 @@ class InstanceInfo < ApplicationRecord
end end
def self.fetch_emoji_reaction_available(domain) def self.fetch_emoji_reaction_available(domain)
return Setting.enable_emoji_reaction if domain.nil?
info = InstanceInfo.find_by(domain: domain) info = InstanceInfo.find_by(domain: domain)
return false if info.nil? return false if info.nil?

2
app/presenters/status_relationships_presenter.rb
View file

@ -19,7 +19,6 @@ class StatusRelationshipsPresenter
@pins_map = {} @pins_map = {}
@filters_map = {} @filters_map = {}
@emoji_reaction_allows_map = nil @emoji_reaction_allows_map = nil
@emoji_reaction_availables_map = {}
else else
statuses = statuses.compact statuses = statuses.compact
statuses += statuses.filter_map(&:quote) 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] || {}) @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] || {}) @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_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] || {} @attributes_map = options[:attributes_map] || {}
end end
end end

6
app/serializers/rest/status_serializer.rb
View file

@ -167,12 +167,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
end end
def emoji_reaction_available_server def emoji_reaction_available_server
if relationships return Setting.enable_emoji_reaction if object.local?
relationships.emoji_reaction_availables_map[object.account.domain] || false
else
InstanceInfo.emoji_reaction_available?(object.account.domain) InstanceInfo.emoji_reaction_available?(object.account.domain)
end end
end
def reactions def reactions
emoji_reactions.tap do |rs| emoji_reactions.tap do |rs|