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

@ -286,7 +286,7 @@ class ActivityPub::ProcessAccountService < BaseService
bio = searchability_from_bio
return bio unless bio.nil?
return misskey_software? ? misskey_searchability_from_indexable : :direct
return invalid_subscription_software? ? misskey_searchability_from_indexable : :direct
end
if audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
@ -328,11 +328,8 @@ class ActivityPub::ProcessAccountService < BaseService
@instance_info ||= InstanceInfo.find_by(domain: @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?(@domain)
end
def subscribable_by