Merge pull request #5001 from pixelfed/staging

Staging
pixelfed · Mar 10, 2024 · 8aae92d · 8aae92d
2 parents 57f4457 + bf46f6f
commit 8aae92d
Show file tree

Hide file tree

Showing 6 changed files with 499 additions and 499 deletions.
diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
@@ -473,15 +473,15 @@ public function inAppRegistrationPreFlightCheck(Request $request)
 	{
 		return [
 			'open' => (bool) config_cache('pixelfed.open_registration'),
-			'iara' => config('pixelfed.allow_app_registration')
+			'iara' => (bool) config_cache('pixelfed.allow_app_registration'),
 		];
 	}
 
 	public function inAppRegistration(Request $request)
 	{
 		abort_if($request->user(), 404);
-		abort_unless(config_cache('pixelfed.open_registration'), 404);
-		abort_unless(config('pixelfed.allow_app_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.open_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.allow_app_registration'), 404);
 		abort_unless($request->hasHeader('X-PIXELFED-APP'), 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -609,8 +609,8 @@ public function inAppRegistrationEmailRedirect(Request $request)
 	public function inAppRegistrationConfirm(Request $request)
 	{
 		abort_if($request->user(), 404);
-		abort_unless(config_cache('pixelfed.open_registration'), 404);
-		abort_unless(config('pixelfed.allow_app_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.open_registration'), 404);
+		abort_unless((bool) config_cache('pixelfed.allow_app_registration'), 404);
 		abort_unless($request->hasHeader('X-PIXELFED-APP'), 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -332,7 +332,7 @@ public function embed(Request $request, $username)
     {
         $res = view('profile.embed-removed');
 
-        if (! config('instance.embed.profile')) {
+        if (! (bool) config_cache('instance.embed.profile')) {
             return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
         }