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

Change: #844 searchableByに意図しない値が入っていたときの挙動 (#862)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-10-02 08:22:30 +09:00 • committed by GitHub
parent 7a6ec3603e
commit 294acdfd94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/services/activitypub/process_account_service.rb
View file

@ -278,7 +278,7 @@ class ActivityPub::ProcessAccountService < BaseService
def audience_searchable_by
return nil if @json['searchableBy'].nil?
@audience_searchable_by_processaccountservice = as_array(@json['searchableBy']).map { |x| value_or_id(x) }
@audience_searchable_by_processaccountservice = as_array(@json['searchableBy']).map { |x| value_or_id(x) }.compact_blank
end
def searchability_from_audience
@ -289,14 +289,16 @@ class ActivityPub::ProcessAccountService < BaseService
return invalid_subscription_software? ? misskey_searchability_from_indexable : :direct
end
return :limited if audience_searchable_by.include?('kmyblue:Limited') || audience_searchable_by.include?('as:Limited')
if audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
:public
elsif audience_searchable_by.include?(@account.followers_url)
:private
elsif audience_searchable_by.include?('kmyblue:Limited') || audience_searchable_by.include?('as:Limited')
:limited
else
elsif audience_searchable_by.include?(@account.uri) || audience_searchable_by.include?(@account.url)
:direct
else
:limited
end
end