From a526f2c3f8ad30a5b92b06b966693cbf8906b362 Mon Sep 17 00:00:00 2001
From: Laravel Shift <shift@laravelshift.com>
Date: Sun, 14 Feb 2021 19:46:03 +0000
Subject: [PATCH] Shift to consistent, fluent response chains

---
 app/Http/Controllers/AccountController.php       | 2 +-
 app/Http/Controllers/AuthController.php          | 8 ++++----
 app/Http/Controllers/ImagesController.php        | 4 ++--
 app/Http/Controllers/NotificationsController.php | 6 +++---
 app/Http/Controllers/TracksController.php        | 4 ++--
 app/Http/Middleware/RedirectIfAuthenticated.php  | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 3a2f9da3..2087f2ed 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -33,7 +33,7 @@ class AccountController extends Controller
 
     public function getRegister()
     {
-        return redirect(config('poniverse.urls')['register']);
+        return redirect()->to(config('poniverse.urls')['register']);
     }
 
     public function getNotifications()
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 969c3b4a..4774d2f6 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -50,14 +50,14 @@ class AuthController extends Controller
                     ->getAuthorizationUrl());
         }
 
-        return redirect('/');
+        return redirect()->to('/');
     }
 
     public function postLogout()
     {
         Auth::logout();
 
-        return redirect('/');
+        return redirect()->to('/');
     }
 
     public function getOAuth(Request $request)
@@ -74,7 +74,7 @@ class AuthController extends Controller
         } catch (IdentityProviderException $e) {
             Log::error($e);
 
-            return redirect('/')->with(
+            return redirect()->to('/')->with(
                 'message',
                 'Unfortunately we are having problems attempting to log you in at the moment. Please try again at a later time.'
             );
@@ -161,6 +161,6 @@ class AuthController extends Controller
     {
         Auth::login($user, $rememberMe);
 
-        return redirect('/');
+        return redirect()->to('/');
     }
 }
diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php
index b296a2dc..d66983f2 100644
--- a/app/Http/Controllers/ImagesController.php
+++ b/app/Http/Controllers/ImagesController.php
@@ -41,13 +41,13 @@ class ImagesController extends Controller
             abort(404);
         }
 
-        $response = response('', 200);
+        $response = response()->noContent(200);
         $filename = $image->getFile($coverType['id']);
 
         if (! is_file($filename)) {
             $redirect = url('/images/icons/profile_'.Image::$ImageTypes[$coverType['id']]['name'].'.png');
 
-            return redirect($redirect);
+            return redirect()->to($redirect);
         }
 
         if (config('app.sendfile')) {
diff --git a/app/Http/Controllers/NotificationsController.php b/app/Http/Controllers/NotificationsController.php
index 0a93597b..444bd18c 100644
--- a/app/Http/Controllers/NotificationsController.php
+++ b/app/Http/Controllers/NotificationsController.php
@@ -45,7 +45,7 @@ class NotificationsController extends Controller
             $email->notification->save();
         });
 
-        return redirect($email->getActivity()->url);
+        return redirect()->to($email->getActivity()->url);
     }
 
     public function getEmailUnsubscribe(Request $request, $subscriptionKey)
@@ -58,12 +58,12 @@ class NotificationsController extends Controller
             return redirect(route('account:settings', [
                 'slug' => $subscription->user->slug,
                 'unsubscribedMessageKey' => $subscription->activity_type,
-            ]), 303);
+            ]), );
         } else {
             return redirect(route('email:confirm-unsubscribed', [
                 'unsubscribedUser' => $subscription->user->display_name,
                 'unsubscribedMessageKey' => $subscription->activity_type,
-            ]), 303);
+            ]), );
         }
     }
 
diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php
index f4dbd32e..396cd727 100644
--- a/app/Http/Controllers/TracksController.php
+++ b/app/Http/Controllers/TracksController.php
@@ -151,7 +151,7 @@ class TracksController extends Controller
 
         $trackFile = TrackFile::findOrFailByExtension($track->id, $extension);
 
-        $response = response('', 200);
+        $response = response()->noContent(200);
         $filename = $trackFile->getFile();
 
         if (! file_exists($filename)) {
@@ -189,7 +189,7 @@ class TracksController extends Controller
         $trackFile = TrackFile::findOrFailByExtension($track->id, $extension);
         ResourceLogItem::logItem('track', $id, ResourceLogItem::DOWNLOAD, $trackFile->getFormat()['index']);
 
-        $response = response('', 200);
+        $response = response()->noContent(200);
         $filename = $trackFile->getFile();
 
         if (config('app.sendfile')) {
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index e5dc4b2f..f40cd456 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -41,7 +41,7 @@ class RedirectIfAuthenticated
 
         foreach ($guards as $guard) {
             if (Auth::guard($guard)->check()) {
-                return redirect(RouteServiceProvider::HOME);
+                return redirect()->to(RouteServiceProvider::HOME);
             }
         }