Change: #737 tanukeyなど小規模Misskeyフォークも、対Misskey配送制限設定対象にする (#823)

* Change: #737 tanukeyなど小規模Misskeyフォークも、対Misskey配送制限設定対象にする

* Fix test

* Add cache

* Remove caches
This commit is contained in:
KMY(雪あすか) 2024-08-28 17:36:27 +09:00 committed by GitHub
parent ae0d35a4fe
commit a7d9fd1e56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 88 additions and 42 deletions

View file

@ -161,14 +161,7 @@ class AccountStatusesFilter
def misskey_software?
return false if @account.nil? || @account.local?
return false if instance_info.nil?
%w(misskey cherrypick).include?(instance_info.software)
end
def instance_info
return @instance_info if defined?(@instance_info)
@instance_info = InstanceInfo.find_by(domain: @account.domain)
InstanceInfo.invalid_subscription_software?(@account.domain)
end
end

View file

@ -103,7 +103,7 @@ class ActivityPub::Parser::StatusParser
return from_audience if from_audience
return nil if default_searchability_from_bio?
searchability_from_bio || (misskey_software? ? misskey_searchability : nil)
searchability_from_bio || (invalid_subscription_software? ? misskey_searchability : nil)
end
def limited_scope
@ -120,7 +120,7 @@ class ActivityPub::Parser::StatusParser
end
def language
lang = raw_language_code || (misskey_software? ? 'ja' : nil)
lang = raw_language_code || (no_language_flag_software? ? 'ja' : nil)
lang.presence && NORMALIZED_LOCALE_NAMES.fetch(lang.downcase.to_sym, lang)
end
@ -162,15 +162,12 @@ class ActivityPub::Parser::StatusParser
@object['nameMap'].is_a?(Hash) && !@object['nameMap'].empty?
end
def instance_info
@instance_info ||= InstanceInfo.find_by(domain: @account.domain)
def no_language_flag_software?
InstanceInfo.no_language_flag_software?(@account.domain)
end
def misskey_software?
info = instance_info
return false if info.nil?
%w(misskey calckey).include?(info.software)
def invalid_subscription_software?
InstanceInfo.invalid_subscription_software?(@account.domain)
end
def misskey_searchability

View file

@ -220,7 +220,7 @@ class StatusReachFinder
def banned_domains_for_misskey_of_status(status)
return [] if status.public_searchability?
from_info = InstanceInfo.where(software: %w(misskey calckey cherrypick sharkey)).pluck(:domain)
from_info = InstanceInfo.where(software: InstanceInfo::INVALID_SUBSCRIPTION_SOFTWARES).pluck(:domain)
from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
(from_info + from_domain_block).uniq
end