Change: #68 限定投稿の検索許可を反応者に設定可能に (#120)

kmycode · Oct 15, 2023 · d0f0dd7 · d0f0dd7
1 parent a772f72
commit d0f0dd7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -631,12 +631,10 @@ def set_searchability
 
     self.searchability = if %w(public public_unlisted login unlisted).include?(visibility)
                            searchability
-                         elsif visibility == 'limited'
-                           :limited
+                         elsif visibility == 'limited' || visibility == 'direct'
+                           searchability == 'limited' ? :limited : :direct
                          elsif visibility == 'private'
                            searchability == 'public' || searchability == 'public_unlisted' ? :private : searchability
-                         elsif visibility == 'direct'
-                           searchability == 'limited' ? :limited : :direct
                          else
                            :direct
                          end

diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
@@ -209,6 +209,17 @@
     expect(status.mentioned_accounts.first.id).to eq mutual_account.id
   end
 
+  it 'limited visibility and direct searchability' do
+    account = Fabricate(:account)
+    text = 'This is an English text.'
+
+    status = subject.call(account, text: text, visibility: 'mutual', searchability: 'public')
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'personal'
+    expect(status.searchability).to eq 'direct'
+  end
+
   it 'personal visibility with mutual' do
     account = Fabricate(:account)
     text = 'This is an English text.'