Merge branch 'kb_lts' into kb_development

app/services/activitypub/process_account_service.rb

@@ -265,7 +265,7 @@ class ActivityPub::ProcessAccountService < BaseService
       bio = searchability_from_bio
       return bio unless bio.nil?
 
-      return misskey_software? ? :public : :direct
+      return misskey_software? ? misskey_searchability_from_indexable : :direct
     end
 
     if audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
@@ -297,6 +297,12 @@ class ActivityPub::ProcessAccountService < BaseService
     searchability
   end
 
+  def misskey_searchability_from_indexable
+    return :public if @json['indexable'].nil?
+
+    @json['indexable'] ? :public : :limited
+  end
+
   def instance_info
     @instance_info ||= InstanceInfo.find_by(domain: @domain)
   end

app/services/post_status_service.rb

@@ -96,6 +96,7 @@ class PostStatusService < BaseService
   end
 
   def load_circle
+    raise ArgumentError if @options[:visibility] == 'limited' && @options[:circle_id].nil?
     return unless @options[:visibility] == 'circle' || (@options[:visibility] == 'limited' && @options[:circle_id].present?)
 
     @circle = @options[:circle_id].present? && Circle.find(@options[:circle_id])

spec/models/status_spec.rb

@@ -169,6 +169,14 @@ RSpec.describe Status do
       end
     end
 
+    context 'when limited-public' do
+      let(:account_searchability) { :limited }
+
+      it 'returns limited' do
+        expect(subject.compute_searchability).to eq 'limited'
+      end
+    end
+
     context 'when private-limited' do
       let(:account_searchability) { :private }
       let(:status_searchability) { :limited }

spec/services/activitypub/process_account_service_spec.rb

@@ -11,6 +11,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
     let(:software) { 'mastodon' }
     let(:searchable_by) { 'https://www.w3.org/ns/activitystreams#Public' }
     let(:sender_bio) { '' }
+    let(:indexable) { nil }
     let(:payload) do
       {
         id: 'https://foo.test',
@@ -18,6 +19,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
         inbox: 'https://foo.test/inbox',
         followers: 'https://example.com/followers',
         searchableBy: searchable_by,
+        indexable: indexable,
         summary: sender_bio,
       }.with_indifferent_access
     end
@@ -73,6 +75,39 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
       it 'searchability is public' do
         expect(subject.searchability).to eq 'public'
       end
+
+      context 'with true indexable' do
+        let(:indexable) { true }
+
+        it 'searchability is public' do
+          expect(subject.searchability).to eq 'public'
+        end
+      end
+
+      context 'with false indexable' do
+        let(:indexable) { false }
+
+        it 'searchability is limited' do
+          expect(subject.searchability).to eq 'limited'
+        end
+      end
+
+      context 'with no-indexable key' do
+        let(:payload) do
+          {
+            id: 'https://foo.test',
+            type: 'Actor',
+            inbox: 'https://foo.test/inbox',
+            followers: 'https://example.com/followers',
+            searchableBy: searchable_by,
+            summary: sender_bio,
+          }.with_indifferent_access
+        end
+
+        it 'searchability is public' do
+          expect(subject.searchability).to eq 'public'
+        end
+      end
     end
 
     context 'with bio' do

spec/services/post_status_service_spec.rb

@@ -206,6 +206,27 @@ RSpec.describe PostStatusService, type: :service do
     expect(status.mentioned_accounts.first.id).to eq circle_account.id
   end
 
+  it 'circle post with limited visibility' do
+    account = Fabricate(:account)
+    circle_account = Fabricate(:account)
+    circle = Fabricate(:circle, account: account)
+    text = 'This is an English text.'
+
+    circle_account.follow!(account)
+    circle.accounts << circle_account
+    status = subject.call(account, text: text, visibility: 'limited', circle_id: circle.id)
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'circle'
+  end
+
+  it 'limited visibility and empty circle' do
+    account = Fabricate(:account)
+    text = 'This is an English text.'
+
+    expect { subject.call(account, text: text, visibility: 'limited') }.to raise_exception ActiveRecord::RecordInvalid
+  end
+
   it 'safeguards mentions' do
     account = Fabricate(:account)
     mentioned_account = Fabricate(:account, username: 'alice')