sant0ro / chocolatey

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function register()
     {
         // Register Mailing Services
-        $this->app->singleton('mailer', function ($app) {
+        $this->app->singleton('mailer', function($app) {
             return $app->loadComponent('mail', 'Illuminate\Mail\MailServiceProvider', 'mailer');
         });
     }

Switch Indentation +13 added lines, -13 removed lines

@@ -1,24 +1,24 @@
-<?php
+ <?php
 
-namespace App\Providers;
+ namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
+ use Illuminate\Support\ServiceProvider;
 
 /**
  * Class AppServiceProvider.
  */
-class AppServiceProvider extends ServiceProvider
-{
-    /**
+ class AppServiceProvider extends ServiceProvider
+ {
+     /**
      * Register any application services.
      *
      * @return void
      */
-    public function register()
-    {
-        // Register Mailing Services
-        $this->app->singleton('mailer', function ($app) {
-            return $app->loadComponent('mail', 'Illuminate\Mail\MailServiceProvider', 'mailer');
-        });
-    }
+     public function register()
+     {
+         // Register Mailing Services
+         $this->app->singleton('mailer', function ($app) {
+             return $app->loadComponent('mail', 'Illuminate\Mail\MailServiceProvider', 'mailer');
+         });
+     }
 }

app/Providers/SessionServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('chocosession', function () {
+        $this->app->bind('chocosession', function() {
             return Session::getInstance();
         });
 

Switch Indentation +14 added lines, -14 removed lines

@@ -1,26 +1,26 @@
-<?php
+ <?php
 
-namespace App\Providers;
+ namespace App\Providers;
 
-use App\Helpers\Session;
-use Illuminate\Support\ServiceProvider;
+ use App\Helpers\Session;
+ use Illuminate\Support\ServiceProvider;
 
 /**
  * Class SessionServiceProvider.
  */
-class SessionServiceProvider extends ServiceProvider
-{
-    /**
+ class SessionServiceProvider extends ServiceProvider
+ {
+     /**
      * Register the Session Service Provider.
      *
      * @return void
      */
-    public function register()
-    {
-        $this->app->bind('chocosession', function () {
-            return Session::getInstance();
-        });
+     public function register()
+     {
+         $this->app->bind('chocosession', function () {
+             return Session::getInstance();
+         });
 
-        Session::getInstance()->start();
-    }
+         Session::getInstance()->start();
+     }
 }

app/Providers/NuxServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('choconux', function () {
+        $this->app->bind('choconux', function() {
             return Nux::getInstance();
         });
     }

Switch Indentation +13 added lines, -13 removed lines

@@ -1,24 +1,24 @@
-<?php
+ <?php
 
-namespace App\Providers;
+ namespace App\Providers;
 
-use App\Helpers\Nux;
-use Illuminate\Support\ServiceProvider;
+ use App\Helpers\Nux;
+ use Illuminate\Support\ServiceProvider;
 
 /**
  * Class NuxServiceProvider.
  */
-class NuxServiceProvider extends ServiceProvider
-{
-    /**
+ class NuxServiceProvider extends ServiceProvider
+ {
+     /**
      * Register the Session Service Provider.
      *
      * @return void
      */
-    public function register()
-    {
-        $this->app->bind('choconux', function () {
-            return Nux::getInstance();
-        });
-    }
+     public function register()
+     {
+         $this->app->bind('choconux', function () {
+             return Nux::getInstance();
+         });
+     }
 }

app/Http/Middleware/Maintenance.php

Spacing +1 added lines, -2 removed lines

@@ -21,7 +21,6 @@
      */
     public function handle($request, Closure $next)
     {
-        return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) :
-            $next($request);
+        return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) : $next($request);
     }
 }

Switch Indentation +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
-<?php
+ <?php
 
-namespace App\Http\Middleware;
+ namespace App\Http\Middleware;
 
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
+ use Closure;
+ use Illuminate\Http\Request;
+ use Illuminate\Support\Facades\Config;
 
 /**
  * Class Maintenance.
  */
-class Maintenance
-{
-    /**
+ class Maintenance
+ {
+     /**
      * Handle an incoming request.
      *
      * @param Request $request
@@ -19,9 +19,9 @@ 
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
-        return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) :
-            $next($request);
-    }
+     public function handle($request, Closure $next)
+     {
+         return Config::get('maintenance.enforce') ? response()->json(['error' => 'maintenance'], 503) :
+             $next($request);
+     }
 }

app/Models/Room.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
      */
     public function getTagsAttribute(): array
     {
-        return array_filter(explode(';', $this->attributes['tags']), function ($element) {
+        return array_filter(explode(';', $this->attributes['tags']), function($element) {
             return !empty($element);
         });
     }

Switch Indentation +94 added lines, -94 removed lines

@@ -1,76 +1,76 @@ 
-<?php
+ <?php
 
-namespace App\Models;
+ namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Config;
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Mappable;
+ use Illuminate\Database\Eloquent\Model;
+ use Illuminate\Support\Facades\Config;
+ use Sofa\Eloquence\Eloquence;
+ use Sofa\Eloquence\Mappable;
 
 /**
  * Class Room.
  *
  * @property int id
  */
-class Room extends Model
-{
-    use Eloquence, Mappable;
+ class Room extends Model
+ {
+     use Eloquence, Mappable;
 
-    /**
+     /**
      * Disable Timestamps.
      *
      * @var bool
      */
-    public $timestamps = false;
+     public $timestamps = false;
 
-    /**
+     /**
      * Leader Board Rank.
      *
      * @var int
      */
-    public $leaderboardRank = 1;
+     public $leaderboardRank = 1;
 
-    /**
+     /**
      * The table associated with the model.
      *
      * @var string
      */
-    protected $table = 'rooms';
+     protected $table = 'rooms';
 
-    /**
+     /**
      * Primary Key of the Table.
      *
      * @var string
      */
-    protected $primaryKey = 'id';
+     protected $primaryKey = 'id';
 
-    /**
+     /**
      * The attributes that will be mapped.
      *
      * @var array
      */
-    protected $maps = ['uniqueId' => 'id', 'ownerName' => 'owner_name', 'ownerUniqueId' => 'owner_id', 'doorMode' => 'state',
-        'leaderboardValue'        => 'score', 'maximumVisitors' => 'users_max', 'habboGroupId' => 'guild_id', 'rating' => 'score', ];
+     protected $maps = ['uniqueId' => 'id', 'ownerName' => 'owner_name', 'ownerUniqueId' => 'owner_id', 'doorMode' => 'state',
+         'leaderboardValue'        => 'score', 'maximumVisitors' => 'users_max', 'habboGroupId' => 'guild_id', 'rating' => 'score', ];
 
-    /**
+     /**
      * The Appender(s) of the Model.
      *
      * @var array
      */
-    protected $appends = ['uniqueId', 'leaderboardRank', 'thumbnailUrl', 'imageUrl', 'leaderboardValue', 'doorMode', 'maximumVisitors',
-        'publicRoom', 'ownerUniqueId', 'ownerName', 'showOwnerName', 'categories', 'rating', ];
+     protected $appends = ['uniqueId', 'leaderboardRank', 'thumbnailUrl', 'imageUrl', 'leaderboardValue', 'doorMode', 'maximumVisitors',
+         'publicRoom', 'ownerUniqueId', 'ownerName', 'showOwnerName', 'categories', 'rating', ];
 
-    /**
+     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['owner_name', 'owner_id', 'is_public', 'state', 'password', 'model', 'users', 'users_max', 'guild_id', 'category', 'score', 'paper_floor', 'paper_wall',
-        'paper_landscape', 'thickness_wall', 'wall_height', 'thickness_floor', 'moodlight_data', 'is_staff_picked', 'allow_other_pets', 'allow_other_pets_eat', 'allow_walkthrough',
-        'allow_hidewall', 'chat_mode', 'chat_weight', 'chat_speed', 'chat_hearing_distance', 'chat_protection', 'override_model', 'who_can_mute', 'who_can_kick', 'who_can_ban', 'poll_id',
-        'roller_speed', 'promoted', 'trade_mode', 'move_diagonally', ];
+     protected $hidden = ['owner_name', 'owner_id', 'is_public', 'state', 'password', 'model', 'users', 'users_max', 'guild_id', 'category', 'score', 'paper_floor', 'paper_wall',
+         'paper_landscape', 'thickness_wall', 'wall_height', 'thickness_floor', 'moodlight_data', 'is_staff_picked', 'allow_other_pets', 'allow_other_pets_eat', 'allow_walkthrough',
+         'allow_hidewall', 'chat_mode', 'chat_weight', 'chat_speed', 'chat_hearing_distance', 'chat_protection', 'override_model', 'who_can_mute', 'who_can_kick', 'who_can_ban', 'poll_id',
+         'roller_speed', 'promoted', 'trade_mode', 'move_diagonally', ];
 
-    /**
+     /**
      * Stores a new Room.
      *
      * @param string $roomName
@@ -86,113 +86,113 @@ 
      *
      * @return Room
      */
-    public function store(string $roomName, string $description, string $model, int $maxUsers, int $roomCategory, int $floorPaper, int $wallPaper, float $landscapePaper, int $ownerId, string $ownerName)
-    {
-        $this->attributes['name'] = $roomName;
-        $this->attributes['description'] = $description;
-        $this->attributes['model'] = $model;
-        $this->attributes['users_max'] = $maxUsers;
-        $this->attributes['category'] = $roomCategory;
-        $this->attributes['paper_floor'] = $floorPaper;
-        $this->attributes['paper_wall'] = $wallPaper;
-        $this->attributes['paper_landscape'] = $landscapePaper;
-        $this->attributes['thickness_wall'] = 0;
-        $this->attributes['wall_height'] = -1;
-        $this->attributes['thickness_floor'] = 0;
-        $this->attributes['owner_id'] = $ownerId;
-        $this->attributes['owner_name'] = $ownerName;
-        $this->timestamps = false;
-
-        $this->save();
-
-        return $this;
-    }
-
-    /**
+     public function store(string $roomName, string $description, string $model, int $maxUsers, int $roomCategory, int $floorPaper, int $wallPaper, float $landscapePaper, int $ownerId, string $ownerName)
+     {
+         $this->attributes['name'] = $roomName;
+         $this->attributes['description'] = $description;
+         $this->attributes['model'] = $model;
+         $this->attributes['users_max'] = $maxUsers;
+         $this->attributes['category'] = $roomCategory;
+         $this->attributes['paper_floor'] = $floorPaper;
+         $this->attributes['paper_wall'] = $wallPaper;
+         $this->attributes['paper_landscape'] = $landscapePaper;
+         $this->attributes['thickness_wall'] = 0;
+         $this->attributes['wall_height'] = -1;
+         $this->attributes['thickness_floor'] = 0;
+         $this->attributes['owner_id'] = $ownerId;
+         $this->attributes['owner_name'] = $ownerName;
+         $this->timestamps = false;
+
+         $this->save();
+
+         return $this;
+     }
+
+     /**
      * Get Room Tags.
      *
      * @return array
      */
-    public function getTagsAttribute(): array
-    {
-        return array_filter(explode(';', $this->attributes['tags']), function ($element) {
-            return !empty($element);
-        });
-    }
+     public function getTagsAttribute(): array
+     {
+         return array_filter(explode(';', $this->attributes['tags']), function ($element) {
+             return !empty($element);
+         });
+     }
 
-    /**
+     /**
      * Get Image Url.
      *
      * @TODO: Get Real Full Room Image
      *
      * @return string
      */
-    public function getImageUrlAttribute(): string
-    {
-        return "//arcturus.wf/full_{$this->attributes['id']}.png";
-    }
+     public function getImageUrlAttribute(): string
+     {
+         return "//arcturus.wf/full_{$this->attributes['id']}.png";
+     }
 
-    /**
+     /**
      * Get Thumbnail Url.
      *
      * @return string
      */
-    public function getThumbnailUrlAttribute(): string
-    {
-        $userName = Config::get('chocolatey.arcturus');
+     public function getThumbnailUrlAttribute(): string
+     {
+         $userName = Config::get('chocolatey.arcturus');
 
-        return "//arcturus.wf/camera/{$userName}/thumbnail_{$this->attributes['id']}.png";
-    }
+         return "//arcturus.wf/camera/{$userName}/thumbnail_{$this->attributes['id']}.png";
+     }
 
-    /**
+     /**
      * Return if need show Owner Name.
      *
      * @TODO: What this really does?
      *
      * @return bool
      */
-    public function getShowOwnerNameAttribute(): bool
-    {
-        return true;
-    }
+     public function getShowOwnerNameAttribute(): bool
+     {
+         return true;
+     }
 
-    /**
+     /**
      * Set a Leader Board Position.
      *
      * @param int $roomPosition
      */
-    public function setLeaderBoardRankAttribute(int $roomPosition = 1)
-    {
-        $this->leaderboardRank = $roomPosition;
-    }
+     public function setLeaderBoardRankAttribute(int $roomPosition = 1)
+     {
+         $this->leaderboardRank = $roomPosition;
+     }
 
-    /**
+     /**
      * Get Leader Board Rank.
      *
      * @return int
      */
-    public function getLeaderBoardRankAttribute(): int
-    {
-        return $this->leaderboardRank;
-    }
+     public function getLeaderBoardRankAttribute(): int
+     {
+         return $this->leaderboardRank;
+     }
 
-    /**
+     /**
      * Get if the Room is Public.
      *
      * @return bool
      */
-    public function getPublicRoomAttribute(): bool
-    {
-        return $this->attributes['is_public'] == 1;
-    }
+     public function getPublicRoomAttribute(): bool
+     {
+         return $this->attributes['is_public'] == 1;
+     }
 
-    /**
+     /**
      * Get Room Category.
      *
      * @return array
      */
-    public function getCategoriesAttribute(): array
-    {
-        return [str_replace('}', '', str_replace('${', '', FlatCat::find($this->attributes['category'])->caption))];
-    }
+     public function getCategoriesAttribute(): array
+     {
+         return [str_replace('}', '', str_replace('${', '', FlatCat::find($this->attributes['category'])->caption))];
+     }
 }

app/Providers/UserServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('chocouser', function () {
+        $this->app->bind('chocouser', function() {
             return User::getInstance();
         });
     }

Switch Indentation +13 added lines, -13 removed lines

@@ -1,24 +1,24 @@
-<?php
+ <?php
 
-namespace App\Providers;
+ namespace App\Providers;
 
-use App\Helpers\User;
-use Illuminate\Support\ServiceProvider;
+ use App\Helpers\User;
+ use Illuminate\Support\ServiceProvider;
 
 /**
  * Class UserServiceProvider.
  */
-class UserServiceProvider extends ServiceProvider
-{
-    /**
+ class UserServiceProvider extends ServiceProvider
+ {
+     /**
      * Register the Session Service Provider.
      *
      * @return void
      */
-    public function register()
-    {
-        $this->app->bind('chocouser', function () {
-            return User::getInstance();
-        });
-    }
+     public function register()
+     {
+         $this->app->bind('chocouser', function () {
+             return User::getInstance();
+         });
+     }
 }

app/Providers/MailServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function register()
     {
-        $this->app->bind('chocomail', function () {
+        $this->app->bind('chocomail', function() {
             return Mail::getInstance();
         });
     }

Switch Indentation +13 added lines, -13 removed lines

@@ -1,24 +1,24 @@
-<?php
+ <?php
 
-namespace App\Providers;
+ namespace App\Providers;
 
-use App\Helpers\Mail;
-use Illuminate\Support\ServiceProvider;
+ use App\Helpers\Mail;
+ use Illuminate\Support\ServiceProvider;
 
 /**
  * Class MailServiceProvider.
  */
-class MailServiceProvider extends ServiceProvider
-{
-    /**
+ class MailServiceProvider extends ServiceProvider
+ {
+     /**
      * Register the Session Service Provider.
      *
      * @return void
      */
-    public function register()
-    {
-        $this->app->bind('chocomail', function () {
-            return Mail::getInstance();
-        });
-    }
+     public function register()
+     {
+         $this->app->bind('chocomail', function () {
+             return Mail::getInstance();
+         });
+     }
 }

app/Http/Controllers/AccountSecurityController.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      *
      * @param Request $request
      *
-     * @return mixed
+     * @return JsonResponse
      */
     public function confirmChangePassword(Request $request): JsonResponse
     {

Switch Indentation +139 added lines, -139 removed lines

@@ -1,89 +1,89 @@ 
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Facades\Mail;
-use App\Facades\User as UserFacade;
-use App\Models\ChocolateyId;
-use App\Models\Question;
-use App\Models\TrustedDevice;
-use App\Models\User;
-use App\Models\UserSecurity;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Config;
-use Laravel\Lumen\Routing\Controller as BaseController;
+ <?php
+
+ namespace App\Http\Controllers;
+
+ use App\Facades\Mail;
+ use App\Facades\User as UserFacade;
+ use App\Models\ChocolateyId;
+ use App\Models\Question;
+ use App\Models\TrustedDevice;
+ use App\Models\User;
+ use App\Models\UserSecurity;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Http\Request;
+ use Illuminate\Http\Response;
+ use Illuminate\Support\Facades\Config;
+ use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
  * Class AccountSecurityController.
  */
-class AccountSecurityController extends BaseController
-{
-    /**
+ class AccountSecurityController extends BaseController
+ {
+     /**
      * Check if Feature Status is Enabled.
      *
      * @return Response
      */
-    public function featureStatus(): Response
-    {
-        if (UserFacade::getUser()->emailVerified == false) {
-            return response('identity_verification_required', 200);
-        }
+     public function featureStatus(): Response
+     {
+         if (UserFacade::getUser()->emailVerified == false) {
+             return response('identity_verification_required', 200);
+         }
 
-        $featureEnabled = UserSecurity::find(UserFacade::getUser()->uniqueId);
+         $featureEnabled = UserSecurity::find(UserFacade::getUser()->uniqueId);
 
-        return response($featureEnabled !== null ? 'enabled' : 'disabled', 200);
-    }
+         return response($featureEnabled !== null ? 'enabled' : 'disabled', 200);
+     }
 
-    /**
+     /**
      * Save Security Questions.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function saveQuestions(Request $request): JsonResponse
-    {
-        if (UserFacade::getUser()->getChocolateyId()->password != hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))) {
-            return response()->json(['error' => 'invalid_password'], 400);
-        }
-
-        UserSecurity::updateOrCreate([
-            'user_id'        => UserFacade::getUser()->uniqueId,
-            'firstQuestion'  => $request->json()->get('questionId1'),
-            'secondQuestion' => $request->json()->get('questionId2'),
-            'firstAnswer'    => $request->json()->get('answer1'),
-            'secondAnswer'   => $request->json()->get('answer2'), ]);
-
-        return response()->json(null, 204);
-    }
-
-    /**
+     public function saveQuestions(Request $request): JsonResponse
+     {
+         if (UserFacade::getUser()->getChocolateyId()->password != hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))) {
+             return response()->json(['error' => 'invalid_password'], 400);
+         }
+
+         UserSecurity::updateOrCreate([
+             'user_id'        => UserFacade::getUser()->uniqueId,
+             'firstQuestion'  => $request->json()->get('questionId1'),
+             'secondQuestion' => $request->json()->get('questionId2'),
+             'firstAnswer'    => $request->json()->get('answer1'),
+             'secondAnswer'   => $request->json()->get('answer2'), ]);
+
+         return response()->json(null, 204);
+     }
+
+     /**
      * Disable Safety Lock.
      *
      * @return JsonResponse
      */
-    public function disable(): JsonResponse
-    {
-        UserSecurity::find(UserFacade::getUser()->uniqueId)->delete();
+     public function disable(): JsonResponse
+     {
+         UserSecurity::find(UserFacade::getUser()->uniqueId)->delete();
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 
-    /**
+     /**
      * Reset Trusted Devices.
      *
      * @return JsonResponse
      */
-    public function reset(): JsonResponse
-    {
-        TrustedDevice::find(UserFacade::getUser()->uniqueId)->delete();
+     public function reset(): JsonResponse
+     {
+         TrustedDevice::find(UserFacade::getUser()->uniqueId)->delete();
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 
-    /**
+     /**
      * Change User Password.
      *
      * @TODO: Implement Notification E-mail of Password change
@@ -92,139 +92,139 @@ 
      *
      * @return JsonResponse
      */
-    public function changePassword(Request $request): JsonResponse
-    {
-        UserFacade::getUser()->getChocolateyId()->update(['password' => hash(Config::get('chocolatey.security.hash'),
-            $request->json()->get('password'))]);
+     public function changePassword(Request $request): JsonResponse
+     {
+         UserFacade::getUser()->getChocolateyId()->update(['password' => hash(Config::get('chocolatey.security.hash'),
+             $request->json()->get('password'))]);
 
-        return response()->json(null, 204);
-    }
+         return response()->json(null, 204);
+     }
 
-    /**
+     /**
      * Confirm E-Mail Activation.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function confirmActivation(Request $request): JsonResponse
-    {
-        if (Mail::get($request->json()->get('token')) == null) {
-            return response()->json(['error' => 'activation.invalid_token'], 400);
-        }
+     public function confirmActivation(Request $request): JsonResponse
+     {
+         if (Mail::get($request->json()->get('token')) == null) {
+             return response()->json(['error' => 'activation.invalid_token'], 400);
+         }
 
-        ChocolateyId::find(Mail::get()->mail)->update(['mail_verified' => '1']);
+         ChocolateyId::find(Mail::get()->mail)->update(['mail_verified' => '1']);
 
-        if (strpos(Mail::get()->link, 'change-email') !== false) {
-            $email = str_replace('change-email/', '', Mail::get()->link);
+         if (strpos(Mail::get()->link, 'change-email') !== false) {
+             $email = str_replace('change-email/', '', Mail::get()->link);
 
-            User::where('mail', Mail::get()->mail)->update(['mail' => $email]);
+             User::where('mail', Mail::get()->mail)->update(['mail' => $email]);
 
-            ChocolateyId::find(Mail::get()->mail)->update(['mail' => $email]);
-        }
+             ChocolateyId::find(Mail::get()->mail)->update(['mail' => $email]);
+         }
 
-        return response()->json(['email' => Mail::get()->mail, 'emailVerified' => true, 'identityVerified' => true]);
-    }
+         return response()->json(['email' => Mail::get()->mail, 'emailVerified' => true, 'identityVerified' => true]);
+     }
 
-    /**
+     /**
      * Change User E-mail.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function changeMail(Request $request): JsonResponse
-    {
-        if (User::where('password', hash(Config::get('chocolatey.security.hash'), $request->json()->get('currentPassword')))->count() == 0) {
-            return response()->json(['error' => 'changeEmail.invalid_password'], 400);
-        }
+     public function changeMail(Request $request): JsonResponse
+     {
+         if (User::where('password', hash(Config::get('chocolatey.security.hash'), $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);
+         $this->sendChangeMailConfirmation($request);
 
-        return response()->json(['email' => $request->json()->get('newEmail')], 200);
-    }
+         return response()->json(['email' => $request->json()->get('newEmail')], 200);
+     }
 
-    /**
+     /**
      * Send the E-Mail confirmation.
      *
      * @param Request $request
      */
-    protected function sendChangeMailConfirmation(Request $request)
-    {
-        Mail::send(['email' => UserFacade::getUser()->email,
-            'name'          => UserFacade::getUser()->name, 'subject' => 'Email change alert',
-        ], 'habbo-web-mail.mail-change-alert');
+     protected function sendChangeMailConfirmation(Request $request)
+     {
+         Mail::send(['email' => UserFacade::getUser()->email,
+             'name'          => UserFacade::getUser()->name, 'subject' => 'Email change alert',
+         ], 'habbo-web-mail.mail-change-alert');
 
-        $generatedToken = Mail::store(UserFacade::getUser()->email,
-            "change-email/{$request->json()->get('newEmail')}");
+         $generatedToken = Mail::store(UserFacade::getUser()->email,
+             "change-email/{$request->json()->get('newEmail')}");
 
-        Mail::send(['email' => $request->json()->get('newEmail'), 'name' => UserFacade::getUser()->name,
-            'subject'       => 'Email change confirmation', 'url' => "/activate/{$generatedToken}",
-        ], 'habbo-web-mail.confirm-mail-change');
-    }
+         Mail::send(['email' => $request->json()->get('newEmail'), 'name' => UserFacade::getUser()->name,
+             'subject'       => 'Email change confirmation', 'url' => "/activate/{$generatedToken}",
+         ], 'habbo-web-mail.confirm-mail-change');
+     }
 
-    /**
+     /**
      * Get User Security Questions.
      *
      * @return JsonResponse
      */
-    public function getQuestions(): JsonResponse
-    {
-        if (UserSecurity::find(UserFacade::getUser()->uniqueId) == null) {
-            return response()->json('');
-        }
-
-        $userSecurity = UserSecurity::find(UserFacade::getUser()->uniqueId);
-
-        return response()->json([
-            new Question($userSecurity->firstQuestion,
-                "IDENTITY_SAFETYQUESTION_{$userSecurity->firstQuestion}"),
-            new Question($userSecurity->secondQuestion,
-                "IDENTITY_SAFETYQUESTION_{$userSecurity->secondQuestion}"),
-        ]);
-    }
-
-    /**
+     public function getQuestions(): JsonResponse
+     {
+         if (UserSecurity::find(UserFacade::getUser()->uniqueId) == null) {
+             return response()->json('');
+         }
+
+         $userSecurity = UserSecurity::find(UserFacade::getUser()->uniqueId);
+
+         return response()->json([
+             new Question($userSecurity->firstQuestion,
+                 "IDENTITY_SAFETYQUESTION_{$userSecurity->firstQuestion}"),
+             new Question($userSecurity->secondQuestion,
+                 "IDENTITY_SAFETYQUESTION_{$userSecurity->secondQuestion}"),
+         ]);
+     }
+
+     /**
      * Verify User Security Questions.
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
-    public function verifyQuestions(Request $request): JsonResponse
-    {
-        $questions = UserSecurity::find(UserFacade::getUser()->uniqueId);
+     public function verifyQuestions(Request $request): JsonResponse
+     {
+         $questions = UserSecurity::find(UserFacade::getUser()->uniqueId);
 
-        if ($questions->firstAnswer == $request->json()->get('answer1') && $questions->secondAnswer == $request->json()->get('answer2')) {
-            if ($request->json()->get('trust') == true) {
-                (new TrustedDevice())->store(UserFacade::getUser()->uniqueId, $request->ip());
-            }
+         if ($questions->firstAnswer == $request->json()->get('answer1') && $questions->secondAnswer == $request->json()->get('answer2')) {
+             if ($request->json()->get('trust') == true) {
+                 (new TrustedDevice())->store(UserFacade::getUser()->uniqueId, $request->ip());
+             }
 
-            return response()->json(null, 204);
-        }
+             return response()->json(null, 204);
+         }
 
-        return response()->json(null, 409);
-    }
+         return response()->json(null, 409);
+     }
 
-    /**
+     /**
      * Confirm User Change Password.
      *
      * @param Request $request
      *
      * @return mixed
      */
-    public function confirmChangePassword(Request $request): JsonResponse
-    {
-        if (Mail::get($request->json()->get('token')) == null) {
-            return response()->json(null, 404);
-        }
+     public function confirmChangePassword(Request $request): JsonResponse
+     {
+         if (Mail::get($request->json()->get('token')) == null) {
+             return response()->json(null, 404);
+         }
 
-        ChocolateyId::find(Mail::get()->mail)->update(['password' => hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))]);
+         ChocolateyId::find(Mail::get()->mail)->update(['password' => hash(Config::get('chocolatey.security.hash'), $request->json()->get('password'))]);
 
-        return response()->json(null);
-    }
+         return response()->json(null);
+     }
 }

app/Models/User.php

Spacing +3 added lines, -3 removed lines

@@ -345,7 +345,7 @@ 
     {
         $accountCreated = $this->attributes['account_created'] ?? time();
 
-        return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
+        return date('Y-m-d', $accountCreated) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
     }
 
     /**
@@ -357,7 +357,7 @@ 
     {
         $accountCreated = $this->attributes['account_created'] ?? time();
 
-        return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
+        return date('Y-m-d', $accountCreated) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $lastLogin = $this->attributes['last_login'] ?? time();
 
-        return date('Y-m-d', $lastLogin).'T'.date('H:i:s.ZZZZ+ZZZZ', $lastLogin);
+        return date('Y-m-d', $lastLogin) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $lastLogin);
     }
 
     /**

Switch Indentation +176 added lines, -176 removed lines

@@ -1,15 +1,15 @@ 
-<?php
+ <?php
 
-namespace App\Models;
+ namespace App\Models;
 
-use Illuminate\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Config;
-use Laravel\Lumen\Auth\Authorizable;
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Mappable;
+ use Illuminate\Auth\Authenticatable;
+ use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
+ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+ use Illuminate\Database\Eloquent\Model;
+ use Illuminate\Support\Facades\Config;
+ use Laravel\Lumen\Auth\Authorizable;
+ use Sofa\Eloquence\Eloquence;
+ use Sofa\Eloquence\Mappable;
 
 /**
  * Class User.
@@ -20,77 +20,77 @@ 
  * @property string name
  * @property string motto
  */
-class User extends Model implements AuthenticatableContract, AuthorizableContract
-{
-    use Authenticatable, Authorizable, Eloquence, Mappable;
+ class User extends Model implements AuthenticatableContract, AuthorizableContract
+ {
+     use Authenticatable, Authorizable, Eloquence, Mappable;
 
-    /**
+     /**
      * Disable Timestamps.
      *
      * @var bool
      */
-    public $timestamps = false;
+     public $timestamps = false;
 
-    /**
+     /**
      * User Traits.
      *
      * @var array
      */
-    public $traits = ['USER'];
+     public $traits = ['USER'];
 
-    /**
+     /**
      * The table associated with the model.
      *
      * @var string
      */
-    protected $table = 'users';
+     protected $table = 'users';
 
-    /**
+     /**
      * Primary Key of the Table.
      *
      * @var string
      */
-    protected $primaryKey = 'id';
+     protected $primaryKey = 'id';
 
-    /**
+     /**
      * The attributes that will be mapped.
      *
      * @var array
      */
-    protected $maps = ['uniqueId' => 'id', 'name' => 'username', 'figureString' => 'look', 'lastWebAccess' => 'last_login', 'creationTime' => 'account_created', 'email' => 'mail', 'identityId' => 'id', 'accountId' => 'id'];
+     protected $maps = ['uniqueId' => 'id', 'name' => 'username', 'figureString' => 'look', 'lastWebAccess' => 'last_login', 'creationTime' => 'account_created', 'email' => 'mail', 'identityId' => 'id', 'accountId' => 'id'];
 
-    /**
+     /**
      * The Appender(s) of the Model.
      *
      * @var array
      */
-    protected $appends = ['habboClubMember', 'buildersClubMember', 'sessionLoginId', 'loginLogId', 'identityVerified', 'identityType', 'trusted', 'country', 'traits',
-        'uniqueId', 'name', 'figureString', 'lastWebAccess', 'creationTime', 'email', 'identityId', 'emailVerified', 'accountId', 'memberSince', 'isBanned', 'banDetails', 'isStaff', 'realEmail', ];
+     protected $appends = ['habboClubMember', 'buildersClubMember', 'sessionLoginId', 'loginLogId', 'identityVerified', 'identityType', 'trusted', 'country', 'traits',
+         'uniqueId', 'name', 'figureString', 'lastWebAccess', 'creationTime', 'email', 'identityId', 'emailVerified', 'accountId', 'memberSince', 'isBanned', 'banDetails', 'isStaff', 'realEmail', ];
 
-    /**
+     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['mail', 'id', 'username', 'auth_ticket', 'last_login', 'ip_current', 'ip_register', 'mail_verified', 'account_day_of_birth',
-        'real_name', 'look', 'gender', 'credits', 'pixels', 'home_room', ];
+     protected $fillable = ['mail', 'id', 'username', 'auth_ticket', 'last_login', 'ip_current', 'ip_register', 'mail_verified', 'account_day_of_birth',
+         'real_name', 'look', 'gender', 'credits', 'pixels', 'home_room', ];
 
-    /**
+     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['id', 'username', 'mail', 'account_created', 'password', 'mail_verified', 'real_name', 'account_day_of_birth',
-        'last_online', 'last_login', 'ip_register', 'auth_ticket', 'home_room', 'points', 'look', 'ip_current', 'online', 'pixels', 'credits', 'gender', 'points', 'rank', ];
+     protected $hidden = ['id', 'username', 'mail', 'account_created', 'password', 'mail_verified', 'real_name', 'account_day_of_birth',
+         'last_online', 'last_login', 'ip_register', 'auth_ticket', 'home_room', 'points', 'look', 'ip_current', 'online', 'pixels', 'credits', 'gender', 'points', 'rank', ];
 
-    /**
+     /**
      * The attributes that should be casted to native types.
      *
      * @var array
      */
-    protected $casts = ['traits' => 'string'];
+     protected $casts = ['traits' => 'string'];
 
-    /**
+     /**
      * Store an User on the Database.
      *
      * @param string $username
@@ -100,186 +100,186 @@ 
      *
      * @return User
      */
-    public function store(string $username, string $email, string $address = '', bool $newUser = true): User
-    {
-        $this->attributes['username'] = $username;
-        $this->attributes['mail'] = $email;
+     public function store(string $username, string $email, string $address = '', bool $newUser = true): User
+     {
+         $this->attributes['username'] = $username;
+         $this->attributes['mail'] = $email;
 
-        $this->attributes['motto'] = Config::get('chocolatey.motto');
-        $this->attributes['look'] = Config::get('chocolatey.figure');
-        $this->attributes['auth_ticket'] = '';
+         $this->attributes['motto'] = Config::get('chocolatey.motto');
+         $this->attributes['look'] = Config::get('chocolatey.figure');
+         $this->attributes['auth_ticket'] = '';
 
-        $this->attributes['password'] = hash(Config::get('chocolatey.security.hash'), openssl_random_pseudo_bytes(50));
-        $this->attributes['account_created'] = time();
+         $this->attributes['password'] = hash(Config::get('chocolatey.security.hash'), openssl_random_pseudo_bytes(50));
+         $this->attributes['account_created'] = time();
 
-        $this->attributes['ip_current'] = $address;
+         $this->attributes['ip_current'] = $address;
 
-        $this->traits = $newUser ? ['NEW_USER', 'USER'] : ['USER'];
+         $this->traits = $newUser ? ['NEW_USER', 'USER'] : ['USER'];
 
-        $this->timestamps = false;
+         $this->timestamps = false;
 
-        $this->save();
-        $this->createData();
+         $this->save();
+         $this->createData();
 
-        return $this;
-    }
+         return $this;
+     }
 
-    /**
+     /**
      * Get User E-mail.
      *
      * @return string
      */
-    public function getRealEmailAttribute()
-    {
-        return $this->attributes['mail'];
-    }
+     public function getRealEmailAttribute()
+     {
+         return $this->attributes['mail'];
+     }
 
-    /**
+     /**
      * Get User E-mail.
      *
      * @return string
      */
-    public function getMailAttribute()
-    {
-        return strpos('-fblogin', $this->attributes['mail']) !== 0 ? 'fblogin' : $this->attributes['mail'];
-    }
+     public function getMailAttribute()
+     {
+         return strpos('-fblogin', $this->attributes['mail']) !== 0 ? 'fblogin' : $this->attributes['mail'];
+     }
 
-    /**
+     /**
      * Store an User Alias Set on Database.
      */
-    public function createData()
-    {
-        (new UserPreferences())->store($this->attributes['id']);
-    }
+     public function createData()
+     {
+         (new UserPreferences())->store($this->attributes['id']);
+     }
 
-    /**
+     /**
      * Get Is User is Banned.
      *
      * @return bool
      */
-    public function getIsBannedAttribute(): bool
-    {
-        $ban = Ban::where('user_id', $this->attributes['id'])->first();
+     public function getIsBannedAttribute(): bool
+     {
+         $ban = Ban::where('user_id', $this->attributes['id'])->first();
 
-        if ($ban == null) {
-            return false;
-        }
+         if ($ban == null) {
+             return false;
+         }
 
-        return $ban->ban_expire >= time();
-    }
+         return $ban->ban_expire >= time();
+     }
 
-    /**
+     /**
      * Check if Is Staff.
      *
      * @return bool
      */
-    public function getIsStaffAttribute(): bool
-    {
-        return array_key_exists('rank', $this->attributes) ? $this->attributes['rank'] >= 5 : false;
-    }
+     public function getIsStaffAttribute(): bool
+     {
+         return array_key_exists('rank', $this->attributes) ? $this->attributes['rank'] >= 5 : false;
+     }
 
-    /**
+     /**
      * Get Ban Details.
      *
      * @return Ban
      */
-    public function getBanDetailsAttribute()
-    {
-        return Ban::where('user_id', $this->attributes['id'])->first();
-    }
+     public function getBanDetailsAttribute()
+     {
+         return Ban::where('user_id', $this->attributes['id'])->first();
+     }
 
-    /**
+     /**
      * Get Current User Country.
      *
      * @TODO: Implement this in a proper way
      *
      * @return string
      */
-    public function getCountryAttribute(): string
-    {
-        return 'com';
-    }
+     public function getCountryAttribute(): string
+     {
+         return 'com';
+     }
 
-    /**
+     /**
      * Set the Trait Attribute.
      *
      * @param array $accountType
      */
-    public function setTraitsAttribute(array $accountType)
-    {
-        $this->traits = $accountType;
-    }
+     public function setTraitsAttribute(array $accountType)
+     {
+         $this->traits = $accountType;
+     }
 
-    /**
+     /**
      * What is this field?
      *
      * @return array
      */
-    public function getTraitsAttribute(): array
-    {
-        if (array_key_exists('rank', $this->attributes) && $this->attributes['rank'] >= config('chocolatey.minRank')) {
-            return ['STAFF'];
-        }
+     public function getTraitsAttribute(): array
+     {
+         if (array_key_exists('rank', $this->attributes) && $this->attributes['rank'] >= config('chocolatey.minRank')) {
+             return ['STAFF'];
+         }
 
-        return $this->traits;
-    }
+         return $this->traits;
+     }
 
-    /**
+     /**
      * We don't care about this?
      *
      * @return bool
      */
-    public function getTrustedAttribute(): bool
-    {
-        if (UserSecurity::find($this->attributes['id']) == null) {
-            return true;
-        }
+     public function getTrustedAttribute(): bool
+     {
+         if (UserSecurity::find($this->attributes['id']) == null) {
+             return true;
+         }
 
-        return in_array($this->attributes['ip_current'],
-            UserSecurity::find($this->attributes['id'])->trustedDevices);
-    }
+         return in_array($this->attributes['ip_current'],
+             UserSecurity::find($this->attributes['id'])->trustedDevices);
+     }
 
-    /**
+     /**
      * What is this field?
      *
      * @return string
      */
-    public function getIdentityTypeAttribute(): string
-    {
-        return strpos('-fblogin', $this->attributes['mail']) !== 0 ? 'FACEBOOK' : 'HABBO';
-    }
+     public function getIdentityTypeAttribute(): string
+     {
+         return strpos('-fblogin', $this->attributes['mail']) !== 0 ? 'FACEBOOK' : 'HABBO';
+     }
 
-    /**
+     /**
      * We don't care about this, every user is trusted.
      *
      * @return bool
      */
-    public function getIdentityVerifiedAttribute(): bool
-    {
-        return true;
-    }
+     public function getIdentityVerifiedAttribute(): bool
+     {
+         return true;
+     }
 
-    /**
+     /**
      * We don't care about this.
      *
      * @return int
      */
-    public function getLoginLogIdAttribute(): int
-    {
-        return 1;
-    }
+     public function getLoginLogIdAttribute(): int
+     {
+         return 1;
+     }
 
-    /**
+     /**
      * We don't care about this.
      *
      * @return int
      */
-    public function getSessionLoginIdAttribute(): int
-    {
-        return 1;
-    }
+     public function getSessionLoginIdAttribute(): int
+     {
+         return 1;
+     }
 
-    /**
+     /**
      * Get the HabboClub Attribute
      * In a Retro Habbo everyone is HC, yeah?
      *
@@ -287,12 +287,12 @@ 
      *
      * @return bool
      */
-    public function getHabboClubMemberAttribute(): bool
-    {
-        return Config::get('chocolatey.ads.enabled') == false;
-    }
+     public function getHabboClubMemberAttribute(): bool
+     {
+         return Config::get('chocolatey.ads.enabled') == false;
+     }
 
-    /**
+     /**
      * Get the Builders Club Attribute
      * In a Retro Habbo everyone is BC, yeah?
      *
@@ -300,75 +300,75 @@ 
      *
      * @return bool
      */
-    public function getBuildersClubMemberAttribute(): bool
-    {
-        return Config::get('chocolatey.ads.enabled') == false;
-    }
+     public function getBuildersClubMemberAttribute(): bool
+     {
+         return Config::get('chocolatey.ads.enabled') == false;
+     }
 
-    /**
+     /**
      * Get GTimestamp in Habbo UserCurrency.
      *
      * @return string
      */
-    public function getAccountCreatedAttribute(): string
-    {
-        $accountCreated = $this->attributes['account_created'] ?? time();
+     public function getAccountCreatedAttribute(): string
+     {
+         $accountCreated = $this->attributes['account_created'] ?? time();
 
-        return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
-    }
+         return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
+     }
 
-    /**
+     /**
      * Get GTimestamp in Habbo UserCurrency.
      *
      * @return string
      */
-    public function getMemberSinceAttribute(): string
-    {
-        $accountCreated = $this->attributes['account_created'] ?? time();
+     public function getMemberSinceAttribute(): string
+     {
+         $accountCreated = $this->attributes['account_created'] ?? time();
 
-        return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
-    }
+         return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated);
+     }
 
-    /**
+     /**
      * Retrieve User Figure String.
      *
      * @return string
      */
-    public function getFigureStringAttribute(): string
-    {
-        return $this->attributes['look'] ?? 'hr-115-42.hd-195-19.ch-3030-82.lg-275-1408.fa-1201.ca-1804-64';
-    }
+     public function getFigureStringAttribute(): string
+     {
+         return $this->attributes['look'] ?? 'hr-115-42.hd-195-19.ch-3030-82.lg-275-1408.fa-1201.ca-1804-64';
+     }
 
-    /**
+     /**
      * Get GTimestamp in Habbo UserCurrency.
      *
      * @return false|string
      */
-    public function getLastLoginAttribute(): string
-    {
-        $lastLogin = $this->attributes['last_login'] ?? time();
+     public function getLastLoginAttribute(): string
+     {
+         $lastLogin = $this->attributes['last_login'] ?? time();
 
-        return date('Y-m-d', $lastLogin).'T'.date('H:i:s.ZZZZ+ZZZZ', $lastLogin);
-    }
+         return date('Y-m-d', $lastLogin).'T'.date('H:i:s.ZZZZ+ZZZZ', $lastLogin);
+     }
 
-    /**
+     /**
      * Get E-Mail Verified Attribute.
      *
      * @return bool
      */
-    public function getEmailVerifiedAttribute(): bool
-    {
-        return strpos('-fblogin', $this->attributes['mail']) !== 0 ?
-            true : ($this->getChocolateyId()->mail_verified ?? false);
-    }
+     public function getEmailVerifiedAttribute(): bool
+     {
+         return strpos('-fblogin', $this->attributes['mail']) !== 0 ?
+             true : ($this->getChocolateyId()->mail_verified ?? false);
+     }
 
-    /**
+     /**
      * Get Account Chocolatey Id.
      *
      * @return ChocolateyId
      */
-    public function getChocolateyId()
-    {
-        return ChocolateyId::find($this->attributes['mail']);
-    }
+     public function getChocolateyId()
+     {
+         return ChocolateyId::find($this->attributes['mail']);
+     }
 }