Fix: #78 検索許可のas:Limitedkmyblue:Limitedに変更

This commit is contained in:
KMY 2023-10-10 21:40:55 +09:00
parent e2c7a6e59b
commit e61350c703
5 changed files with 24 additions and 5 deletions

View file

@ -509,7 +509,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
nil
elsif audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
:public
elsif audience_searchable_by.include?('as:Limited')
elsif audience_searchable_by.include?('kmyblue:Limited') || audience_searchable_by.include?('as:Limited')
:limited
elsif audience_searchable_by.include?(@account.followers_url)
:private

View file

@ -243,7 +243,7 @@ class ActivityPub::TagManager
when 'direct'
status.conversation_id.present? ? [uri_for(status.conversation)] : []
when 'limited'
['as:Limited']
['as:Limited', 'kmyblue:Limited']
else
[]
end
@ -258,7 +258,7 @@ class ActivityPub::TagManager
when 'private', 'direct'
[account_followers_url(account)]
when 'limited'
['as:Limited']
['as:Limited', 'kmyblue:Limited']
else
[]
end

View file

@ -272,7 +272,7 @@ class ActivityPub::ProcessAccountService < BaseService
:public
elsif audience_searchable_by.include?(@account.followers_url)
:private
elsif audience_searchable_by.include?('as:Limited')
elsif audience_searchable_by.include?('kmyblue:Limited') || audience_searchable_by.include?('as:Limited')
:limited
else
:direct

View file

@ -445,6 +445,17 @@ RSpec.describe ActivityPub::Activity::Create do
end
context 'with limited' do
let(:searchable_by) { 'kmyblue:Limited' }
it 'create status' do
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.searchability).to eq 'limited'
end
end
context 'with limited old spec' do
let(:searchable_by) { 'as:Limited' }
it 'create status' do
@ -570,7 +581,7 @@ RSpec.describe ActivityPub::Activity::Create do
context 'with misskey' do
let(:sender_software) { 'misskey' }
let(:searchable_by) { 'as:Limited' }
let(:searchable_by) { 'kmyblue:Limited' }
it 'create status' do
status = sender.statuses.first

View file

@ -53,6 +53,14 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
end
context 'when limited' do
let(:searchable_by) { 'kmyblue:Limited' }
it 'searchability is limited' do
expect(subject.searchability).to eq 'limited'
end
end
context 'when limited old spec' do
let(:searchable_by) { 'as:Limited' }
it 'searchability is limited' do