sant0ro / chocolatey

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']);
+     }
 }

app/Http/Controllers/LoginController.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
             return response()->json(UserFacade::setSession(User::where('real_name', $fbUser->getId())->first()));
         }
 
-        (new AccountController())->createUser($request, ['email' => $fbUser->getEmail().'-fblogin'], true, false);
+        (new AccountController())->createUser($request, ['email' => $fbUser->getEmail() . '-fblogin'], true, false);
 
         UserFacade::updateSession(['last_login' => time(), 'ip_register' => $request->ip(), 'ip_current' => $request->ip(), 'real_name' => $fbUser->getId()]);
 

app/Http/Controllers/AccountController.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
             'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false ? '1' : '0',
         ]);
 
-        foreach ((array) $request->json()->all() as $setting => $value) {
+        foreach ((array)$request->json()->all() as $setting => $value) {
             UserPreferences::find(UserFacade::getUser()->uniqueId)->update([$setting => $value == true ? '1' : '0']);
         }
 
@@ -151,7 +151,7 @@ 
 
         if ($sendEmail == true) {
             Mail::send(['email' => $userInfo['email'], 'name' => $userName, 'url' => "/activate/{$token}",
-                'subject'       => 'Welcome to '.Config::get('chocolatey.hotelName'), ]);
+                'subject'       => 'Welcome to ' . Config::get('chocolatey.hotelName'), ]);
         }
 
         return UserFacade::setSession((new User())->store($userName, $userInfo['email'], $request->ip(), $newUser));
@@ -170,7 +170,7 @@ 
     {
         $partialName = explode(' ', (new Alliteration())->getName());
 
-        return strtolower($partialName[0].strstr($userMail, '@', true).$partialName[1]);
+        return strtolower($partialName[0] . strstr($userMail, '@', true) . $partialName[1]);
     }
 
     /**
@@ -219,7 +219,7 @@ 
         $token = Mail::store(UserFacade::getUser()->email, 'public/registration/activate');
 
         Mail::send(['name' => UserFacade::getUser()->name, 'email' => $request->user()->email,
-            'url'          => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName'),
+            'url'          => "/activate/{$token}", 'subject' => 'Welcome to ' . Config::get('chocolatey.hotelName'),
         ]);
 
         return response(null);