Merge pull request #4290 from pixelfed/staging

Staging

CHANGELOG.md

@@ -21,7 +21,8 @@
 - Update admin autospam/report email templates, remove image previews ([76be49ac](https://github.com/pixelfed/pixelfed/commit/76be49ac))
 - Update LandingService, enable landing directory/explore feed by default and move configuration to config/instance.php file ([780f2507](https://github.com/pixelfed/pixelfed/commit/780f2507))
 - Update ImageOptimizePipeline, improve support for disabling image optimizations ([e76289e4](https://github.com/pixelfed/pixelfed/commit/e76289e4))
-- Update LandingController, fix configonfig variable names ([b716926b](https://github.com/pixelfed/pixelfed/commit/b716926b))
+- Update LandingController, fix config variable names ([b716926b](https://github.com/pixelfed/pixelfed/commit/b716926b))
+-  Update Privacy Settings, add Directory setting ([634c15e4](https://github.com/pixelfed/pixelfed/commit/634c15e4))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.5 (2023-03-25)](https://github.com/pixelfed/pixelfed/compare/v0.11.4...v0.11.5)

app/Http/Controllers/Settings/PrivacySettings.php

@@ -38,6 +38,10 @@ trait PrivacySettings
           'show_profile_follower_count',
           'show_profile_following_count',
         ];
+
+		$profile->is_suggestable = $request->input('is_suggestable') == 'on';
+		$profile->save();
+
         foreach ($fields as $field) {
             $form = $request->input($field);
             if ($field == 'is_private') {

resources/views/settings/privacy.blade.php

@@ -24,6 +24,7 @@
       </label>
       <p class="text-muted small help-text">When your account is private, only people you approve can see your photos and videos on pixelfed. Your existing followers won't be affected.</p>
     </div>
+
     <div class="form-check pb-3">
       <input class="form-check-input" type="checkbox" name="crawlable" id="crawlable" {{!$settings->crawlable ? 'checked=""':''}} {{$settings->is_private ? 'disabled=""':''}}>
       <label class="form-check-label font-weight-bold" for="crawlable">
@@ -33,13 +34,14 @@
     </div>
 
 
-    {{-- <div class="form-check pb-3">
+    <div class="form-check pb-3">
-      <input class="form-check-input" type="checkbox" name="show_discover" id="show_discover" {{$settings->is_private ? 'disabled=""':''}} {{$settings->show_discover ? 'checked=""':''}}>
+      <input class="form-check-input" type="checkbox" name="is_suggestable" id="is_suggestable" {{$settings->is_private ? 'disabled=""':''}} {{auth()->user()->profile->is_suggestable ? 'checked=""':''}}>
-      <label class="form-check-label font-weight-bold" for="show_discover">
+      <label class="form-check-label font-weight-bold" for="is_suggestable">
-        {{__('Visible on discover')}}
+        {{__('Show on Directory')}}
       </label>
-      <p class="text-muted small help-text">When this option is enabled, your profile and posts are used for discover recommendations. Only public profiles and posts are used.</p>
+      <p class="text-muted small help-text">When this option is enabled, your profile is included in the Directory. Only public profiles are eligible.</p>
-    </div> --}}
+    </div>
+
     <div class="form-check pb-3">
       <input class="form-check-input" type="checkbox" id="public_dm" {{$settings->public_dm ? 'checked=""':''}} name="public_dm">
       <label class="form-check-label font-weight-bold" for="public_dm">
@@ -189,4 +191,4 @@
   });
 
 </script>
-@endpush
+@endpush