sant0ro / chocolatey

app/Http/Controllers/LoginController.php

Braces +12 added lines, -8 removed lines

@@ -24,8 +24,9 @@ 
     public function login(Request $request): JsonResponse
     {
         if ($request->user()):
-            if ($request->user()->isBanned)
-                $this->sendBanMessage($request);
+            if ($request->user()->isBanned) {
+                            $this->sendBanMessage($request);
+            }
 
             $request->user()->update(['last_login' => time(), 'ip_current' => $request->ip()]);
 
@@ -69,18 +70,21 @@ 
      */
     public function register(Request $request): JsonResponse
     {
-        if (strpos($request->json()->get('email'), '@') == false)
-            return response()->json(['error' => 'registration_email'], 409);
+        if (strpos($request->json()->get('email'), '@') == false) {
+                    return response()->json(['error' => 'registration_email'], 409);
+        }
 
-        if (ChocolateyId::query()->where('mail', $request->json()->get('email'))->count() > 0)
-            return response()->json(['error' => 'registration_email_in_use'], 409);
+        if (ChocolateyId::query()->where('mail', $request->json()->get('email'))->count() > 0) {
+                    return response()->json(['error' => 'registration_email_in_use'], 409);
+        }
 
         $userData = (new AccountController)->createUser($request, $request->json()->all(), true);
 
         $userData->update(['last_login' => time()]);
 
-        if (Config::get('chocolatey.vote.enabled'))
-            Session::set('VotePolicy', true);
+        if (Config::get('chocolatey.vote.enabled')) {
+                    Session::set('VotePolicy', true);
+        }
 
         return response()->json($userData);
     }

app/Http/Controllers/AccountController.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     protected function filterName(string $userName): bool
     {
-        return count(array_filter(Config::get('chocolatey.invalid'), function ($username) use ($userName) {
+        return count(array_filter(Config::get('chocolatey.invalid'), function($username) use ($userName) {
                 return $username == $userName;
             })) == 0;
     }
@@ -141,7 +141,7 @@ 
             'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false
         ]);
 
-        foreach((array)$request->json()->all() as $setting => $value)
+        foreach ((array)$request->json()->all() as $setting => $value)
             UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
 
         return response()->json(null);

Braces +27 added lines, -18 removed lines

@@ -39,11 +39,13 @@ 
      */
     public function checkName(Request $request): JsonResponse
     {
-        if (User::where('username', $request->json()->get('name'))->count() > 0 && $request->json()->get('name') != $request->user()->name)
-            return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]);
+        if (User::where('username', $request->json()->get('name'))->count() > 0 && $request->json()->get('name') != $request->user()->name) {
+                    return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]);
+        }
 
-        if (strlen($request->json()->get('name')) > 50 || $this->filterName($request->json()->get('name')))
-            return response()->json(['code' => 'INVALID_NAME', 'validationResult' => null, 'suggestions' => []]);
+        if (strlen($request->json()->get('name')) > 50 || $this->filterName($request->json()->get('name'))) {
+                    return response()->json(['code' => 'INVALID_NAME', 'validationResult' => null, 'suggestions' => []]);
+        }
 
         return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]);
     }
@@ -91,8 +93,9 @@ 
      */
     public function selectRoom(Request $request): JsonResponse
     {
-        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3]))
-            return response(null, 400);
+        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) {
+                    return response(null, 400);
+        }
 
         $request->user()->traits = ["USER"];
 
@@ -122,8 +125,9 @@ 
     {
         $userPreferences = UserPreferences::find($request->user()->uniqueId);
 
-        foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue)
-            $userPreferences->{$attributeName} = $attributeValue == 1;
+        foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) {
+                    $userPreferences->{$attributeName} = $attributeValue == 1;
+        }
 
         return response()->json($userPreferences);
     }
@@ -141,8 +145,9 @@ 
             'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false
         ]);
 
-        foreach((array)$request->json()->all() as $setting => $value)
-            UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
+        foreach((array)$request->json()->all() as $setting => $value) {
+                    UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
+        }
 
         return response()->json(null);
     }
@@ -169,8 +174,9 @@ 
      */
     public function checkNewName(Request $request): JsonResponse
     {
-        if (User::where('username', $request->input('name'))->count() > 0 || !$this->filterName($request->input('name')))
-            return response()->json(['isAvailable' => false]);
+        if (User::where('username', $request->input('name'))->count() > 0 || !$this->filterName($request->input('name'))) {
+                    return response()->json(['isAvailable' => false]);
+        }
 
         return response()->json(['isAvailable' => true]);
     }
@@ -183,8 +189,9 @@ 
      */
     public function createAvatar(Request $request): JsonResponse
     {
-        if (User::where('username', $request->json()->get('name'))->count() > 0)
-            return response()->json(['isAvailable' => false]);
+        if (User::where('username', $request->json()->get('name'))->count() > 0) {
+                    return response()->json(['isAvailable' => false]);
+        }
 
         $request->user()->name = $request->json()->get('name');
 
@@ -241,8 +248,9 @@ 
      */
     public function confirmActivation(Request $request): JsonResponse
     {
-        if (($mail = (new MailController)->getMail($request->json()->get('token'))) == null)
-            return response()->json(['error' => 'activation.invalid_token'], 400);
+        if (($mail = (new MailController)->getMail($request->json()->get('token'))) == null) {
+                    return response()->json(['error' => 'activation.invalid_token'], 400);
+        }
 
         if (strpos($mail->link, 'change-email') !== false):
             $mail = str_replace('change-email/', '', $mail->link);
@@ -265,8 +273,9 @@ 
      */
     public function forgotPassword(Request $request): JsonResponse
     {
-        if (($user = User::where('mail', $request->json()->get('email'))->first()) == null)
-            return response()->json(['email' => $request->json()->get('email')]);
+        if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) {
+                    return response()->json(['email' => $request->json()->get('email')]);
+        }
 
         $mailController = new MailController;