diff --git a/CHANGELOG.md b/CHANGELOG.md index d9d3a5630..f842cdeb7 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/app/Services/LandingService.php b/app/Services/LandingService.php index a59e91e80..f0af2ddf8 100644 --- a/app/Services/LandingService.php +++ b/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_explore_feed' => config_cache('landing.show_explore_feed') == 1, + 'show_directory' => config('instance.landing.show_directory'), + 'show_explore_feed' => config('instance.landing.show_explore'), 'open_registration' => config_cache('pixelfed.open_registration') == 1, 'version' => config('pixelfed.version'), 'about' => [ diff --git a/config/instance.php b/config/instance.php index 327573c5d..7ba66c85e 100644 --- a/config/instance.php +++ b/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), ] ]; diff --git a/resources/views/admin/settings/home.blade.php b/resources/views/admin/settings/home.blade.php index 82e743685..89f860b0a 100644 --- a/resources/views/admin/settings/home.blade.php +++ b/resources/views/admin/settings/home.blade.php @@ -149,15 +149,15 @@
- -

The instance name.

+ +

The instance name. Change in Brand section.

- -

Description of instance used on about section.

+ +

Description of instance used on about section. Change in Brand section.

@@ -166,16 +166,18 @@
- +
+

To disable the Directory, set INSTANCE_LANDING_SHOW_DIRECTORY=false in .env

- +
+

To disable the Explore feed, set INSTANCE_LANDING_SHOW_EXPLORE=false in .env