Merge pull request #4286 from pixelfed/staging

Staging

CHANGELOG.md

@@ -19,6 +19,7 @@
 - Update MediaS3GarbageCollector, fix handle ([2eee36cf](https://github.com/pixelfed/pixelfed/commit/2eee36cf))
 - Update StatusController, allow users to delete replies to posts ([738925c2](https://github.com/pixelfed/pixelfed/commit/738925c2))
 - 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))
 -  ([](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/Services/LandingService.php

@@ -53,8 +53,8 @@ class LandingService
 			'name' => config_cache('app.name'),
 			'url' => config_cache('app.url'),
 			'domain' => config('pixelfed.domain.app'),
-			'show_directory' => config_cache('landing.show_directory') == 1,
+			'show_directory' => config('instance.landing.show_directory'),
-			'show_explore_feed' => config_cache('landing.show_explore_feed') == 1,
+			'show_explore_feed' => config('instance.landing.show_explore'),
 			'open_registration' => config_cache('pixelfed.open_registration') == 1,
 			'version' => config('pixelfed.version'),
 			'about' => [

config/instance.php

@@ -119,5 +119,10 @@ return [
 			'to' => env('INSTANCE_REPORTS_EMAIL_ADDRESSES'),
 			'autospam' => env('INSTANCE_REPORTS_EMAIL_AUTOSPAM', false)
 		]
+	],
+
+	'landing' => [
+		'show_directory' => env('INSTANCE_LANDING_SHOW_DIRECTORY', true),
+		'show_explore' => env('INSTANCE_LANDING_SHOW_EXPLORE', true),
 	]
 ];

resources/views/admin/settings/home.blade.php

@@ -149,15 +149,15 @@
 		<div class="form-group mb-0">
 			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
 				<label class="font-weight-bold text-muted">Name</label>
-				<input class="form-control col-8" name="name" placeholder="Pixelfed" value="{{config_cache('app.name')}}">
+				<input class="form-control col-8" name="name" placeholder="Pixelfed" value="{{config_cache('app.name')}}" disabled>
-				<p class="help-text small text-muted mt-3 mb-0">The instance name.</p>
+				<p class="help-text small text-muted mt-3 mb-0">The instance name. Change in Brand section.</p>
 			</div>
 		</div>
 		<div class="form-group mb-0">
 			<div class="ml-n4 mr-n2 p-3 border-bottom">
 				<label class="font-weight-bold text-muted">About</label>
-				<textarea class="form-control" rows="3" name="long_description">{{config_cache('app.description')}}</textarea>
+				<textarea class="form-control" rows="3" name="long_description" disabled>{{config_cache('app.description')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Description of instance used on about section.</p>
+				<p class="help-text small text-muted mt-3 mb-0">Description of instance used on about section. Change in Brand section.</p>
 			</div>
 		</div>
 		<div class="form-group mb-0">
@@ -166,16 +166,18 @@
 
 				<div class="my-3">
 					<div class="custom-control custom-checkbox">
-						<input type="checkbox" class="custom-control-input" id="show_directory" name="show_directory" {{ config_cache('landing.show_directory') ? 'checked' : ''}}>
+						<input type="checkbox" class="custom-control-input" id="show_directory" name="show_directory" {{ config('instance.landing.show_directory') ? 'checked' : ''}} disabled>
 						<label class="custom-control-label font-weight-bold" for="show_directory">Show Directory</label>
 					</div>
+					<p class="help-text small text-muted mt-3 mb-0">To disable the Directory, set <code>INSTANCE_LANDING_SHOW_DIRECTORY=false</code> in .env</p>
 				</div>
 
 				<div class="my-3">
 					<div class="custom-control custom-checkbox">
-						<input type="checkbox" class="custom-control-input" id="show_explore_feed" name="show_explore_feed" {{ config_cache('landing.show_explore_feed') ? 'checked' : ''}}>
+						<input type="checkbox" class="custom-control-input" id="show_explore_feed" name="show_explore_feed" {{ config('instance.landing.show_explore') ? 'checked' : ''}} disabled>
 						<label class="custom-control-label font-weight-bold" for="show_explore_feed">Show Explore Feed</label>
 					</div>
+					<p class="help-text small text-muted mt-3 mb-0">To disable the Explore feed, set <code>INSTANCE_LANDING_SHOW_EXPLORE=false</code> in .env</p>
 				</div>
 			</div>
 		</div>