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

kmycode · Oct 10, 2023 · e61350c · e61350c
1 parent e2c7a6e
commit e61350c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
@@ -509,7 +509,7 @@ def searchability_from_audience
       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

diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
@@ -243,7 +243,7 @@ def searchable_by(status)
       when 'direct'
         status.conversation_id.present? ? [uri_for(status.conversation)] : []
       when 'limited'
-        ['as:Limited']
+        ['as:Limited', 'kmyblue:Limited']
       else
         []
       end
@@ -258,7 +258,7 @@ def account_searchable_by(account)
     when 'private', 'direct'
       [account_followers_url(account)]
     when 'limited'
-      ['as:Limited']
+      ['as:Limited', 'kmyblue:Limited']
     else
       []
     end

diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
@@ -272,7 +272,7 @@ def searchability_from_audience
       :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

diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
@@ -445,6 +445,17 @@
         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 @@
 
         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

diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
@@ -53,6 +53,14 @@
     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