From 57341a82ac6771aab4272d1c13de6e7288d04fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Tue, 6 Feb 2024 10:03:41 +0900
Subject: [PATCH] =?UTF-8?q?Change:=20=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E7=84=A1=E5=8A=B9=E3=81=AB=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=E6=99=82=E3=80=81`/api/v1/timelines/public`=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E5=8F=96=E5=BE=97=E3=81=A7?=
 =?UTF-8?q?=E3=80=8C=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E3=81=BF=E3=80=8D=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E3=82=82=E7=84=A1=E5=8A=B9=E5=8C=96=20(#526)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Change: ローカルタイムラインを無効にしている時、「リモートユーザーのみ」指定も無効化

* Fix test
---
 .../mastodon/features/firehose/index.jsx      | 22 +++----
 app/models/public_feed.rb                     |  2 +-
 spec/models/public_feed_spec.rb               | 64 ++++++++++++++++---
 spec/requests/api/v1/timelines/public_spec.rb |  1 +
 4 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index 2f62288f4c..b6bc43ab89 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -171,21 +171,21 @@ const Firehose = ({ feedType, multiColumn }) => {
         <ColumnSettings />
       </ColumnHeader>
 
-      <div className='account__section-headline'>
-        {enableLocalTimeline && (
+      {enableLocalTimeline && (
+        <div className='account__section-headline'>
           <NavLink exact to='/public/local'>
             <FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
           </NavLink>
-        )}
+          
+          <NavLink exact to='/public/remote'>
+            <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
+          </NavLink>
 
-        <NavLink exact to='/public/remote'>
-          <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
-        </NavLink>
-
-        <NavLink exact to='/public'>
-          <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
-        </NavLink>
-      </div>
+          <NavLink exact to='/public'>
+            <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
+          </NavLink>
+        </div>
+      )}
 
       <StatusListContainer
         prepend={prependBanner}
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index cc91741c5f..c11b68f97c 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -53,7 +53,7 @@ class PublicFeed
   end
 
   def remote_only?
-    options[:remote] && !options[:local]
+    options[:remote] && !options[:local] && Setting.enable_local_timeline
   end
 
   def hide_local_users?
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb
index c36be48822..d948b958d6 100644
--- a/spec/models/public_feed_spec.rb
+++ b/spec/models/public_feed_spec.rb
@@ -88,9 +88,21 @@ RSpec.describe PublicFeed do
           expect(subject).to include(local_status.id)
         end
 
-        it 'excludes public_unlisted statuses' do
+        it 'includes public_unlisted statuses' do
           expect(subject).to include(public_unlisted_status.id)
         end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
 
       context 'with a viewer' do
@@ -107,6 +119,18 @@ RSpec.describe PublicFeed do
         it 'excludes public_unlisted statuses' do
           expect(subject).to include(public_unlisted_status.id)
         end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
     end
 
@@ -159,15 +183,15 @@ RSpec.describe PublicFeed do
         it 'includes public_unlisted statuses' do
           expect(subject).to include(public_unlisted_status.id)
         end
-      end
 
-      context 'when local timeline is disabled' do
-        before do
-          Form::AdminSettings.new(enable_local_timeline: '0').save
-        end
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
 
-        it 'does not include all statuses' do
-          expect(subject).to eq []
+          it 'does not include all statuses' do
+            expect(subject).to eq []
+          end
         end
       end
     end
@@ -192,6 +216,18 @@ RSpec.describe PublicFeed do
         it 'excludes public_unlisted statuses' do
           expect(subject).to_not include(public_unlisted_status.id)
         end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses with local' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
 
       context 'with a viewer' do
@@ -205,6 +241,18 @@ RSpec.describe PublicFeed do
         it 'excludes public_unlisted statuses' do
           expect(subject).to_not include(public_unlisted_status.id)
         end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses with local' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
     end
 
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index ed4c2170cd..66354ca71e 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -67,6 +67,7 @@ describe 'Public' do
 
         context 'when local timeline is disabled' do
           let(:ltl_enabled) { false }
+          let(:expected_statuses) { [local_status, remote_status, media_status] }
 
           it_behaves_like 'a successful request to the public timeline'
         end