hm

app/controllers/api/v1/timelines/public_controller.rb

@@ -17,7 +17,7 @@ def require_auth?
     if Setting.timeline_preview false
       if truthy_param?(:local)
         !Setting.timeline_preview_local
-      elsif truthy_param?(:remote)
+      elsif truthy_param?(:remote) or truthy_param?(:allow_local_only)
         !Setting.timeline_preview_remote
       end
     else

app/helpers/admin/settings/discovery_helper.rb

@@ -12,4 +12,12 @@ def discovery_hint_text
   def discovery_recommended_value
     authorized_fetch_overridden? ? :overridden : nil
   end
+
+  def public_feed_auth
+    Setting.timeline_preview
+  end
+
+  def public_timelines_warning_hint_text
+    public_feed_auth? ? t('admin.settings.security.public_timelines_warning_hint') : nil
+  end
 end

app/views/admin/settings/discovery/show.html.haml

@@ -29,15 +29,11 @@
   .fields-group
     = f.input :timeline_preview, as: :boolean, wrapper: :with_label
 
-  %h4= t('admin.settings.discovery.public_timelines_local')
-
   .fields-group
-    = f.input :timeline_preview_local, as: :boolean, wrapper: :with_label
-
-  %h4= t('admin.settings.discovery.public_timelines_remote')
+    = f.input :timeline_preview_local, as: :boolean, wrapper: :with_label, warning_hint: public_timelines_warning_hint_text, disabled: public_feed_auth?
 
   .fields-group
-    = f.input :timeline_preview_remote, as: :boolean, wrapper: :with_label
+    = f.input :timeline_preview_remote, as: :boolean, wrapper: :with_label, warning_hint: public_timelines_warning_hint_text, disabled: public_feed_auth?
 
   .fields-group
     = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')

config/locales/en.yml

@@ -787,6 +787,7 @@ en:
         authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
         authorized_fetch_overridden_hint: You are currently unable to change this setting because it is overridden by an environment variable.
         federation_authentication: Federation authentication enforcement
+        public_timelines_warning_hint: Overridden by the general toggle
       title: Server settings
     site_uploads:
       delete: Delete uploaded file

config/locales/simple_form.en.yml

@@ -265,8 +265,8 @@ en:
         theme: Default theme
         thumbnail: Server thumbnail
         timeline_preview: Allow unauthenticated access to public timelines
-        timeline_preview: Allow unauthenticated access to local timeline
-        timeline_preview: Allow unauthenticated access to remote timeline
+        timeline_preview_local: Allow unauthenticated access to local timeline
+        timeline_preview_remote: Allow unauthenticated access to remote timeline
         trendable_by_default: Allow trends without prior review
         trends: Enable trends
         trends_as_landing_page: Use trends as the landing page

config/settings.yml

@@ -13,8 +13,8 @@ defaults: &defaults
   profile_directory: true
   closed_registrations_message: ''
   timeline_preview: false
-  timeline_preview_local: false
-  timeline_preview_remote: false
+  timeline_preview_local: true
+  timeline_preview_remote: true
   show_staff_badge: true
   preview_sensitive_media: false
   noindex: false