sant0ro / chocolatey

app/Models/User.php

Braces +3 added lines, -2 removed lines

@@ -234,8 +234,9 @@
      */
     public function getTrustedAttribute(): bool
     {
-        if (UserSecurity::find($this->attributes['id']) == null)
-            return true;
+        if (UserSecurity::find($this->attributes['id']) == null) {
+                    return true;
+        }
 
         return in_array($this->attributes['ip_current'],
             UserSecurity::find($this->attributes['id'])->trustedDevices);

app/Models/UserSecurity.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     public function getTrustedDevicesAttribute(): array
     {
         return TrustedDevice::where('user_id', $this->attributes['user_id'])->get(['ip_address'])
-            ->map(function ($item) {
+            ->map(function($item) {
                 return $item->ip_address;
             })->toArray();
     }

app/Http/Controllers/ArticleController.php

Spacing +3 added lines, -4 removed lines

@@ -27,8 +27,7 @@ 
 
         $categoryPage = strstr(strrev($articleCategory), '_', true);
 
-        return $articleCategory == 'front' ? $this->front() :
-            $this->category($countryId, $category, $categoryPage,
+        return $articleCategory == 'front' ? $this->front() : $this->category($countryId, $category, $categoryPage,
                 $categoryPage == 1 ? 0 : (10 * ($categoryPage - 1)));
     }
 
@@ -57,7 +56,7 @@ 
     protected function category(string $countryId, ArticleCategory $category, int $categoryPage, int $start): Response
     {
         $articles = Article::where('id', '>=', $start)
-            ->limit(10)->get()->filter(function ($item) use ($category) {
+            ->limit(10)->get()->filter(function($item) use ($category) {
                 return $category->name == 'all' || in_array($category, $item->categories);
             });
 
@@ -86,7 +85,7 @@ 
         if (($article = Article::find(strstr($articleName, '_', true))) == null)
             return response()->json(null, 404);
 
-        $related = ($latest = Article::all())->filter(function ($item) use ($article) {
+        $related = ($latest = Article::all())->filter(function($item) use ($article) {
             return in_array($article->categories[0], $item->categories);
         });
 

Braces +6 added lines, -4 removed lines

@@ -61,8 +61,9 @@ 
                 return $category->name == 'all' || in_array($category, $item->categories);
             });
 
-        if ($articles->count() == 0)
-            return response()->json(null, 404);
+        if ($articles->count() == 0) {
+                    return response()->json(null, 404);
+        }
 
         return response(view('habbo-web-news.articles-category', [
             'category' => $category,
@@ -83,8 +84,9 @@ 
      */
     public function one(string $countryId, string $articleName): Response
     {
-        if (($article = Article::find(strstr($articleName, '_', true))) == null)
-            return response()->json(null, 404);
+        if (($article = Article::find(strstr($articleName, '_', true))) == null) {
+                    return response()->json(null, 404);
+        }
 
         $related = ($latest = Article::all())->filter(function ($item) use ($article) {
             return in_array($article->categories[0], $item->categories);

app/Http/Controllers/AccountController.php

Braces +24 added lines, -16 removed lines

@@ -26,8 +26,9 @@ 
      */
     public function checkName(Request $request): JsonResponse
     {
-        if (User::where('username', $request->json()->get('name'))->count() > 0)
-            return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]);
+        if (User::where('username', $request->json()->get('name'))->count() > 0) {
+                    return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]);
+        }
 
         return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]);
     }
@@ -75,8 +76,9 @@ 
      */
     public function selectRoom(Request $request): JsonResponse
     {
-        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3]))
-            return response('', 400);
+        if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) {
+                    return response('', 400);
+        }
 
         $request->user()->traits = ["USER"];
 
@@ -106,8 +108,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);
     }
@@ -153,8 +156,9 @@ 
      */
     public function checkNewName(Request $request): JsonResponse
     {
-        if (User::where('username', $request->input('name'))->count() > 0)
-            return response()->json(['isAvailable' => false]);
+        if (User::where('username', $request->input('name'))->count() > 0) {
+                    return response()->json(['isAvailable' => false]);
+        }
 
         return response()->json(['isAvailable' => true]);
     }
@@ -167,8 +171,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');
 
@@ -228,8 +233,9 @@ 
      */
     public function confirmActivation(Request $request): JsonResponse
     {
-        if (($mailRequest = (new MailController)->getMail($request->json()->get('token'))) == null)
-            return response()->json(['error' => 'activation.invalid_token'], 400);
+        if (($mailRequest = (new MailController)->getMail($request->json()->get('token'))) == null) {
+                    return response()->json(['error' => 'activation.invalid_token'], 400);
+        }
 
         if (strpos($mailRequest->link, 'change-email') !== false):
             $mail = str_replace('change-email/', '', $mailRequest->link);
@@ -240,8 +246,9 @@ 
 
         DB::table('users')->where('mail', $mailRequest->mail)->update(['mail_verified' => 1]);
 
-        if ($request->user() !== null)
-            $request->user()->emailVerified = true;
+        if ($request->user() !== null) {
+                    $request->user()->emailVerified = true;
+        }
 
         return response()->json(['email' => $mailRequest->mail, 'emailVerified' => true, 'identityVerified' => true]);
     }
@@ -254,8 +261,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;
 

app/Http/Controllers/AccountSecurityController.php

Braces +30 added lines, -20 removed lines

@@ -28,8 +28,9 @@ 
      */
     public function featureStatus(Request $request): Response
     {
-        if ($request->user()->emailVerified == false)
-            return response('identity_verification_required', 200);
+        if ($request->user()->emailVerified == false) {
+                    return response('identity_verification_required', 200);
+        }
 
         $featureEnabled = UserSecurity::find($request->user()->uniqueId);
 
@@ -44,8 +45,9 @@ 
      */
     public function saveQuestions(Request $request): JsonResponse
     {
-        if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0)
-            return response()->json(['error' => 'invalid_password'], 400);
+        if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0) {
+                    return response()->json(['error' => 'invalid_password'], 400);
+        }
 
         UserSecurity::updateOrCreate([
             'user_id' => $request->user()->uniqueId,
@@ -93,12 +95,14 @@ 
      */
     public function changePassword(Request $request): JsonResponse
     {
-        if (strlen($request->json()->get('password')) < 6)
-            return response()->json(['error' => 'password.current_password.invalid'], 409);
+        if (strlen($request->json()->get('password')) < 6) {
+                    return response()->json(['error' => 'password.current_password.invalid'], 409);
+        }
 
         //@TODO: This search the whole base. If anyone has the same password.. This will give error. Is this good?
-        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() >= 1)
-            return response()->json(['error' => 'password.used_earlier'], 409);
+        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() >= 1) {
+                    return response()->json(['error' => 'password.used_earlier'], 409);
+        }
 
         User::find($request->user()->uniqueId)->update(['password' =>
             hash('sha256', $request->json()->get('password'))]);
@@ -114,11 +118,13 @@ 
      */
     public function changeMail(Request $request): JsonResponse
     {
-        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0)
-            return response()->json(['error' => 'changeEmail.invalid_password'], 400);
+        if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) {
+                    return response()->json(['error' => 'changeEmail.invalid_password'], 400);
+        }
 
-        if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0)
-            return response()->json(['error' => 'changeEmail.email_already_in_use'], 400);
+        if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) {
+                    return response()->json(['error' => 'changeEmail.email_already_in_use'], 400);
+        }
 
         $this->sendChangeMailConfirmation($request);
 
@@ -159,8 +165,9 @@ 
      */
     public function getQuestions(Request $request): JsonResponse
     {
-        if (UserSecurity::find($request->user()->uniqueId) == null)
-            return response()->json('');
+        if (UserSecurity::find($request->user()->uniqueId) == null) {
+                    return response()->json('');
+        }
 
         $userSecurity = UserSecurity::find($request->user()->uniqueId);
 
@@ -184,8 +191,9 @@ 
                 ->where('firstAnswer', $request->json()->get('answer1'))
                 ->where('secondAnswer', $request->json()->get('answer2'))->count() > 0
         ):
-            if ($request->json()->get('trust') == true)
-                (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save();
+            if ($request->json()->get('trust') == true) {
+                            (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save();
+            }
 
             $request->user()->trusted = true;
 
@@ -205,11 +213,13 @@ 
     {
         $mailRequest = Mail::where('token', $request->json()->get('token'))->where('used', '0')->first();
 
-        if ($mailRequest == null)
-            return response()->json(null, 404);
+        if ($mailRequest == null) {
+                    return response()->json(null, 404);
+        }
 
-        if (User::where('password', hash('sha256', $request->json()->get('password')))->count() >= 1)
-            return response()->json(['error' => 'password.used_earlier'], 400);
+        if (User::where('password', hash('sha256', $request->json()->get('password')))->count() >= 1) {
+                    return response()->json(['error' => 'password.used_earlier'], 400);
+        }
 
         $mailRequest->update(['used' => '1']);
 

app/Http/Controllers/MailController.php

Braces +3 added lines, -2 removed lines

@@ -76,8 +76,9 @@
     {
         $mailRequest = MailModel::where('token', $token)->where('used', '0')->first();
 
-        if ($mailRequest !== null)
-            $mailRequest->update(['used' => '1']);
+        if ($mailRequest !== null) {
+                    $mailRequest->update(['used' => '1']);
+        }
 
         return $mailRequest;
     }