Completed
Pull Request — development (#288)
by Claudio
07:22 queued 05:08
created
app/Http/Controllers/ArticleController.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
      */
56 56
     protected function category(string $countryId, ArticleCategory $category, int $categoryPage, int $start): Response
57 57
     {
58
-        $articles = Article::where('id', '>=', $start)->limit(10)->orderBy('id', 'DESC')->get()->filter(function ($item) use ($category) {
58
+        $articles = Article::where('id', '>=', $start)->limit(10)->orderBy('id', 'DESC')->get()->filter(function($item) use ($category) {
59 59
             return $category->name == 'all' || in_array($category, $item->categories);
60 60
         });
61 61
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
             return response()->json(null, 404);
81 81
         }
82 82
 
83
-        $related = ($latest = Article::all())->filter(function ($item) use ($article) {
83
+        $related = ($latest = Article::all())->filter(function($item) use ($article) {
84 84
             return in_array($article->categories[0], $item->categories);
85 85
         });
86 86
 
Please login to merge, or discard this patch.
Switch Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use App\Models\Article;
6
-use App\Models\ArticleCategory;
7
-use Illuminate\Http\Response;
8
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use App\Models\Article;
6
+ use App\Models\ArticleCategory;
7
+ use Illuminate\Http\Response;
8
+ use Laravel\Lumen\Routing\Controller as BaseController;
9 9
 
10 10
 /**
11 11
  * Class ArticleController.
12 12
  */
13
-class ArticleController extends BaseController
14
-{
15
-    /**
13
+ class ArticleController extends BaseController
14
+ {
15
+     /**
16 16
      * Render a specific view of Article set.
17 17
      *
18 18
      * @param string $countryId
@@ -20,28 +20,28 @@  discard block
 block discarded – undo
20 20
      *
21 21
      * @return Response
22 22
      */
23
-    public function many(string $countryId, string $articleCategory): Response
24
-    {
25
-        $category = ArticleCategory::find(strstr(($articleCategory =
26
-            str_replace('.html', '', $articleCategory)), '_', true));
23
+     public function many(string $countryId, string $articleCategory): Response
24
+     {
25
+         $category = ArticleCategory::find(strstr(($articleCategory =
26
+             str_replace('.html', '', $articleCategory)), '_', true));
27 27
 
28
-        $categoryPage = strstr(strrev($articleCategory), '_', true);
28
+         $categoryPage = strstr(strrev($articleCategory), '_', true);
29 29
 
30
-        return $articleCategory == 'front' ? $this->front() : $this->category($countryId, $category, $categoryPage,
31
-            $categoryPage == 1 ? 0 : (10 * ($categoryPage - 1)));
32
-    }
30
+         return $articleCategory == 'front' ? $this->front() : $this->category($countryId, $category, $categoryPage,
31
+             $categoryPage == 1 ? 0 : (10 * ($categoryPage - 1)));
32
+     }
33 33
 
34
-    /**
34
+     /**
35 35
      * Render the Front Page of the Articles Page.
36 36
      *
37 37
      * @return Response
38 38
      */
39
-    protected function front(): Response
40
-    {
41
-        return response(view('habbo-web-news.articles-front', ['set' => Article::orderBy('id', 'DESC')->limit(10)->get()]));
42
-    }
39
+     protected function front(): Response
40
+     {
41
+         return response(view('habbo-web-news.articles-front', ['set' => Article::orderBy('id', 'DESC')->limit(10)->get()]));
42
+     }
43 43
 
44
-    /**
44
+     /**
45 45
      * Render a specific Category Articles Page.
46 46
      *
47 47
      * @TODO: Proper Way to use Country ID
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
53 53
      *
54 54
      * @return Response
55 55
      */
56
-    protected function category(string $countryId, ArticleCategory $category, int $categoryPage, int $start): Response
57
-    {
58
-        $articles = Article::where('id', '>=', $start)->limit(10)->orderBy('id', 'DESC')->get()->filter(function ($item) use ($category) {
59
-            return $category->name == 'all' || in_array($category, $item->categories);
60
-        });
56
+     protected function category(string $countryId, ArticleCategory $category, int $categoryPage, int $start): Response
57
+     {
58
+         $articles = Article::where('id', '>=', $start)->limit(10)->orderBy('id', 'DESC')->get()->filter(function ($item) use ($category) {
59
+             return $category->name == 'all' || in_array($category, $item->categories);
60
+         });
61 61
 
62
-        return response(view('habbo-web-news.articles-category', [
63
-            'category' => $category, 'page' => $categoryPage, 'categories' => ArticleCategory::all(), 'articles' => $articles,
64
-        ]));
65
-    }
62
+         return response(view('habbo-web-news.articles-category', [
63
+             'category' => $category, 'page' => $categoryPage, 'categories' => ArticleCategory::all(), 'articles' => $articles,
64
+         ]));
65
+     }
66 66
 
67
-    /**
67
+     /**
68 68
      * Render a specific view of a specific Article.
69 69
      *
70 70
      * @TODO: Proper Way to use Country ID
@@ -74,28 +74,28 @@  discard block
 block discarded – undo
74 74
      *
75 75
      * @return Response
76 76
      */
77
-    public function one(string $countryId, string $articleName): Response
78
-    {
79
-        if (($article = Article::find(strstr($articleName, '_', true))) == null) {
80
-            return response()->json(null, 404);
81
-        }
77
+     public function one(string $countryId, string $articleName): Response
78
+     {
79
+         if (($article = Article::find(strstr($articleName, '_', true))) == null) {
80
+             return response()->json(null, 404);
81
+         }
82 82
 
83
-        $related = ($latest = Article::all())->filter(function ($item) use ($article) {
84
-            return in_array($article->categories[0], $item->categories);
85
-        });
83
+         $related = ($latest = Article::all())->filter(function ($item) use ($article) {
84
+             return in_array($article->categories[0], $item->categories);
85
+         });
86 86
 
87
-        return response(view('habbo-web-news.articles-view',
88
-            ['article' => $article, 'latest' => $latest->slice(0, 5), 'related' => $related->slice(0, 5)]
89
-        ));
90
-    }
87
+         return response(view('habbo-web-news.articles-view',
88
+             ['article' => $article, 'latest' => $latest->slice(0, 5), 'related' => $related->slice(0, 5)]
89
+         ));
90
+     }
91 91
 
92
-    /**
92
+     /**
93 93
      * Get All Habbo Articles as XML/RSS.
94 94
      *
95 95
      * @return Response
96 96
      */
97
-    public function getRss()
98
-    {
99
-        return response(view('habbo-web-pages.habbo-rss', ['articles' => Article::limit(20)->get()]))->header('Content-Type', 'text/xml');
100
-    }
97
+     public function getRss()
98
+     {
99
+         return response(view('habbo-web-pages.habbo-rss', ['articles' => Article::limit(20)->get()]))->header('Content-Type', 'text/xml');
100
+     }
101 101
 }
Please login to merge, or discard this patch.
app/Http/Controllers/ImagingController.php 2 patches
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public function getUserHead(Request $request)
27 27
     {
28
-        return redirect(Config::get('chocolatey.imaging').'avatarimage?figure='.($request->has('figure') ? $request->input('figure') :
29
-                User::where('username', $request->input('user'))->first()->figureString).'&size=l&headonly=1');
28
+        return redirect(Config::get('chocolatey.imaging') . 'avatarimage?figure=' . ($request->has('figure') ? $request->input('figure') : User::where('username', $request->input('user'))->first()->figureString) . '&size=l&headonly=1');
30 29
     }
31 30
 
32 31
     /**
@@ -39,7 +38,7 @@  discard block
 block discarded – undo
39 38
      */
40 39
     public function getUserBody(string $figure)
41 40
     {
42
-        return redirect(Config::get('chocolatey.imaging')."avatar/{$figure}");
41
+        return redirect(Config::get('chocolatey.imaging') . "avatar/{$figure}");
43 42
     }
44 43
 
45 44
     /**
Please login to merge, or discard this patch.
Switch Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use App\Models\EmulatorSettings;
6
-use App\Models\User;
7
-use Illuminate\Http\Request;
8
-use Illuminate\Support\Facades\Config;
9
-use Intervention\Image\Facades\Image;
10
-use Laravel\Lumen\Http\Redirector;
11
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use App\Models\EmulatorSettings;
6
+ use App\Models\User;
7
+ use Illuminate\Http\Request;
8
+ use Illuminate\Support\Facades\Config;
9
+ use Intervention\Image\Facades\Image;
10
+ use Laravel\Lumen\Http\Redirector;
11
+ use Laravel\Lumen\Routing\Controller as BaseController;
12 12
 
13 13
 /**
14 14
  * Class ImagingController.
15 15
  */
16
-class ImagingController extends BaseController
17
-{
18
-    /**
16
+ class ImagingController extends BaseController
17
+ {
18
+     /**
19 19
      * Get User Figure for Big Header
20 20
      * based on User Name or Figure.
21 21
      *
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
      *
24 24
      * @return Redirector
25 25
      */
26
-    public function getUserHead(Request $request)
27
-    {
28
-        return redirect(Config::get('chocolatey.imaging').'avatarimage?figure='.($request->has('figure') ? $request->input('figure') :
29
-                User::where('username', $request->input('user'))->first()->figureString).'&size=l&headonly=1');
30
-    }
26
+     public function getUserHead(Request $request)
27
+     {
28
+         return redirect(Config::get('chocolatey.imaging').'avatarimage?figure='.($request->has('figure') ? $request->input('figure') :
29
+                 User::where('username', $request->input('user'))->first()->figureString).'&size=l&headonly=1');
30
+     }
31 31
 
32
-    /**
32
+     /**
33 33
      * Get User Figure for Body
34 34
      * based on User Figure.
35 35
      *
@@ -37,36 +37,36 @@  discard block
 block discarded – undo
37 37
      *
38 38
      * @return Redirector
39 39
      */
40
-    public function getUserBody(string $figure)
41
-    {
42
-        return redirect(Config::get('chocolatey.imaging')."avatar/{$figure}");
43
-    }
40
+     public function getUserBody(string $figure)
41
+     {
42
+         return redirect(Config::get('chocolatey.imaging')."avatar/{$figure}");
43
+     }
44 44
 
45
-    /**
45
+     /**
46 46
      * Get Youtube Thumbnail.
47 47
      *
48 48
      * @param Request $request
49 49
      *
50 50
      * @return string
51 51
      */
52
-    public function getYoutubeThumbnail(Request $request)
53
-    {
54
-        return Image::make($request->input('url'))->response('jpg');
55
-    }
52
+     public function getYoutubeThumbnail(Request $request)
53
+     {
54
+         return Image::make($request->input('url'))->response('jpg');
55
+     }
56 56
 
57
-    /**
57
+     /**
58 58
      * Return Group Badge.
59 59
      *
60 60
      * @param string $badgeCode
61 61
      *
62 62
      * @return mixed
63 63
      */
64
-    public function getGroupBadge(string $badgeCode)
65
-    {
66
-        $imagePath = EmulatorSettings::where('key', 'imager.location.output.badges')->first();
64
+     public function getGroupBadge(string $badgeCode)
65
+     {
66
+         $imagePath = EmulatorSettings::where('key', 'imager.location.output.badges')->first();
67 67
 
68
-        $badgeCode = str_replace('.gif', '', $badgeCode);
68
+         $badgeCode = str_replace('.gif', '', $badgeCode);
69 69
 
70
-        return Image::make("{$imagePath->value}/{$badgeCode}.png")->response('gif');
71
-    }
70
+         return Image::make("{$imagePath->value}/{$badgeCode}.png")->response('gif');
71
+     }
72 72
 }
Please login to merge, or discard this patch.
app/Helpers/User.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
      */
123 123
     public function hasSession()
124 124
     {
125
-        return (bool) Session::get(Config::get('chocolatey.security.session'));
125
+        return (bool)Session::get(Config::get('chocolatey.security.session'));
126 126
     }
127 127
 
128 128
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/LanguageController.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,26 +1,26 @@
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use Illuminate\Http\Response;
6
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use Illuminate\Http\Response;
6
+ use Laravel\Lumen\Routing\Controller as BaseController;
7 7
 
8 8
 /**
9 9
  * Class LanguageController.
10 10
  */
11
-class LanguageController extends BaseController
12
-{
13
-    /**
11
+ class LanguageController extends BaseController
12
+ {
13
+     /**
14 14
      * Render Language View (jSON).
15 15
      *
16 16
      * @param $languageFile
17 17
      *
18 18
      * @return Response
19 19
      */
20
-    public function render($languageFile): Response
21
-    {
22
-        $languageName = strstr($languageFile, '.json', true);
20
+     public function render($languageFile): Response
21
+     {
22
+         $languageName = strstr($languageFile, '.json', true);
23 23
 
24
-        return response(view("habbo-web-l10n.{$languageName}"))->header('Content-Type', 'application/json');
25
-    }
24
+         return response(view("habbo-web-l10n.{$languageName}"))->header('Content-Type', 'application/json');
25
+     }
26 26
 }
Please login to merge, or discard this patch.
app/Http/Middleware/Authenticate.php 1 patch
Switch Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,34 +1,34 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Middleware;
3
+ namespace App\Http\Middleware;
4 4
 
5
-use Closure;
6
-use Illuminate\Contracts\Auth\Factory as Auth;
7
-use Illuminate\Http\Request;
5
+ use Closure;
6
+ use Illuminate\Contracts\Auth\Factory as Auth;
7
+ use Illuminate\Http\Request;
8 8
 
9 9
 /**
10 10
  * Class Authenticate.
11 11
  */
12
-class Authenticate
13
-{
14
-    /**
12
+ class Authenticate
13
+ {
14
+     /**
15 15
      * The authentication guard factory instance.
16 16
      *
17 17
      * @var Auth
18 18
      */
19
-    protected $auth;
19
+     protected $auth;
20 20
 
21
-    /**
21
+     /**
22 22
      * Create a new middleware instance.
23 23
      *
24 24
      * @param Auth $auth
25 25
      */
26
-    public function __construct(Auth $auth)
27
-    {
28
-        $this->auth = $auth;
29
-    }
26
+     public function __construct(Auth $auth)
27
+     {
28
+         $this->auth = $auth;
29
+     }
30 30
 
31
-    /**
31
+     /**
32 32
      * Handle an incoming request.
33 33
      *
34 34
      * @param Request     $request
@@ -37,16 +37,16 @@  discard block
 block discarded – undo
37 37
      *
38 38
      * @return mixed
39 39
      */
40
-    public function handle($request, Closure $next, $guard = null)
41
-    {
42
-        if ($this->auth->guard($guard)->guest()) {
43
-            return response()->json(['message' => 'authentication-needed'], 401);
44
-        }
40
+     public function handle($request, Closure $next, $guard = null)
41
+     {
42
+         if ($this->auth->guard($guard)->guest()) {
43
+             return response()->json(['message' => 'authentication-needed'], 401);
44
+         }
45 45
 
46
-        if ($request->user()->isBanned == true) {
47
-            return response('Unauthorized.', 401);
48
-        }
46
+         if ($request->user()->isBanned == true) {
47
+             return response('Unauthorized.', 401);
48
+         }
49 49
 
50
-        return $next($request);
51
-    }
50
+         return $next($request);
51
+     }
52 52
 }
Please login to merge, or discard this patch.
app/Http/Middleware/Cors.php 1 patch
Switch Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Middleware;
3
+ namespace App\Http\Middleware;
4 4
 
5
-use Closure;
6
-use Illuminate\Http\Request;
7
-use Illuminate\Support\Facades\Config;
5
+ use Closure;
6
+ use Illuminate\Http\Request;
7
+ use Illuminate\Support\Facades\Config;
8 8
 
9 9
 /**
10 10
  * Class Cors.
11 11
  */
12
-class Cors
13
-{
14
-    /**
12
+ class Cors
13
+ {
14
+     /**
15 15
      * Handle an incoming request.
16 16
      *
17 17
      * @param Request $request
@@ -19,10 +19,10 @@  discard block
 block discarded – undo
19 19
      *
20 20
      * @return mixed
21 21
      */
22
-    public function handle($request, Closure $next)
23
-    {
24
-        return $next($request)
25
-            ->header('Access-Control-Allow-Origin', implode(',', Config::get('chocolatey.cors')))
26
-            ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
27
-    }
22
+     public function handle($request, Closure $next)
23
+     {
24
+         return $next($request)
25
+             ->header('Access-Control-Allow-Origin', implode(',', Config::get('chocolatey.cors')))
26
+             ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
27
+     }
28 28
 }
Please login to merge, or discard this patch.
app/Providers/AuthServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
      */
20 20
     public function boot()
21 21
     {
22
-        $this->app['auth']->viaRequest('api', function ($request) {
22
+        $this->app['auth']->viaRequest('api', function($request) {
23 23
             return User::getInstance()->getUser();
24 24
         });
25 25
     }
Please login to merge, or discard this patch.
app/Helpers/Nux.php 1 patch
Switch Indentation   +144 added lines, -144 removed lines patch added patch discarded remove patch
@@ -40,166 +40,166 @@
 block discarded – undo
40 40
         switch ($request->json()->get('roomIndex')):
41 41
             case 1:
42 42
                 return $this->createBedRoom($request->user());
43
-        case 2:
44
-                return $this->createPoolRoom($request->user());
45
-        case 3:
46
-                return $this->createClubRoom($request->user());
47
-        default:
48
-                return false;
49
-        endswitch;
50
-    }
51
-
52
-    /**
43
+         case 2:
44
+                 return $this->createPoolRoom($request->user());
45
+         case 3:
46
+                 return $this->createClubRoom($request->user());
47
+         default:
48
+                 return false;
49
+         endswitch;
50
+     }
51
+
52
+     /**
53 53
      * Create the NUX Bed Room.
54 54
      *
55 55
      * @param User $user
56 56
      *
57 57
      * @return bool
58 58
      */
59
-    protected function createBedRoom(User $user): bool
60
-    {
61
-        $room = (new Room())->store("{$user->name}'s room", "{$user->name} has entered the building", 'model_h', 25, 12, 610, 2403, 0.0, $user->uniqueId, $user->name);
62
-
63
-        $user->update(['home_room' => $room->id]);
64
-
65
-        // Floor Items
66
-        (new RoomItem())->store($user->uniqueId, $room->id, 15542, 9, 9, '0.00000', 4, '');
67
-        (new RoomItem())->store($user->uniqueId, $room->id, 15542, 9, 12, '0.00000', 0, '');
68
-        (new RoomItem())->store($user->uniqueId, $room->id, 15542, 10, 9, '0.00000', 4, '');
69
-        (new RoomItem())->store($user->uniqueId, $room->id, 15542, 10, 12, '0.00000', 0, '');
70
-        (new RoomItem())->store($user->uniqueId, $room->id, 16412, 9, 5, '1.00000', 0, '');
71
-        (new RoomItem())->store($user->uniqueId, $room->id, 16435, 7, 5, '1.00000', 0, '');
72
-        (new RoomItem())->store($user->uniqueId, $room->id, 16486, 8, 5, '1.00000', 0, '');
73
-        (new RoomItem())->store($user->uniqueId, $room->id, 17816, 6, 2, '1.00000', 0, '4');
74
-        (new RoomItem())->store($user->uniqueId, $room->id, 17816, 9, 2, '1.00000', 0, '4');
75
-        (new RoomItem())->store($user->uniqueId, $room->id, 17824, 7, 2, '1.00000', 0, '1');
76
-        (new RoomItem())->store($user->uniqueId, $room->id, 17894, 9, 10, '0.00000', 0, '');
77
-        (new RoomItem())->store($user->uniqueId, $room->id, 18074, 8, 4, '1.00000', 0, '1');
78
-        (new RoomItem())->store($user->uniqueId, $room->id, 18817, 3, 10, '0.01000', 2, '');
79
-        (new RoomItem())->store($user->uniqueId, $room->id, 18835, 3, 9, '0.00000', 0, '');
80
-        (new RoomItem())->store($user->uniqueId, $room->id, 18835, 3, 11, '0.00000', 0, '');
81
-        (new RoomItem())->store($user->uniqueId, $room->id, 18835, 5, 9, '0.00000', 0, '');
82
-        (new RoomItem())->store($user->uniqueId, $room->id, 18835, 5, 11, '0.00000', 0, '');
83
-
84
-        // Wall Items
85
-        (new RoomItem())->store($user->uniqueId, $room->id, 22988, 0, 0, '0', 0, '', ':w=4,2 l=0,35 l');
86
-        (new RoomItem())->store($user->uniqueId, $room->id, 23163, 0, 0, '0', 0, '1', ':w=4,8 l=0,43 r');
87
-        (new RoomItem())->store($user->uniqueId, $room->id, 23261, 0, 0, '0', 0, '', ':w=2,10 l=2,34 l');
88
-        (new RoomItem())->store($user->uniqueId, $room->id, 23331, 0, 0, '0', 0, '', ':w=2,10 l=2,29 l');
89
-
90
-        return true;
91
-    }
92
-
93
-    /**
59
+     protected function createBedRoom(User $user): bool
60
+     {
61
+         $room = (new Room())->store("{$user->name}'s room", "{$user->name} has entered the building", 'model_h', 25, 12, 610, 2403, 0.0, $user->uniqueId, $user->name);
62
+
63
+         $user->update(['home_room' => $room->id]);
64
+
65
+         // Floor Items
66
+         (new RoomItem())->store($user->uniqueId, $room->id, 15542, 9, 9, '0.00000', 4, '');
67
+         (new RoomItem())->store($user->uniqueId, $room->id, 15542, 9, 12, '0.00000', 0, '');
68
+         (new RoomItem())->store($user->uniqueId, $room->id, 15542, 10, 9, '0.00000', 4, '');
69
+         (new RoomItem())->store($user->uniqueId, $room->id, 15542, 10, 12, '0.00000', 0, '');
70
+         (new RoomItem())->store($user->uniqueId, $room->id, 16412, 9, 5, '1.00000', 0, '');
71
+         (new RoomItem())->store($user->uniqueId, $room->id, 16435, 7, 5, '1.00000', 0, '');
72
+         (new RoomItem())->store($user->uniqueId, $room->id, 16486, 8, 5, '1.00000', 0, '');
73
+         (new RoomItem())->store($user->uniqueId, $room->id, 17816, 6, 2, '1.00000', 0, '4');
74
+         (new RoomItem())->store($user->uniqueId, $room->id, 17816, 9, 2, '1.00000', 0, '4');
75
+         (new RoomItem())->store($user->uniqueId, $room->id, 17824, 7, 2, '1.00000', 0, '1');
76
+         (new RoomItem())->store($user->uniqueId, $room->id, 17894, 9, 10, '0.00000', 0, '');
77
+         (new RoomItem())->store($user->uniqueId, $room->id, 18074, 8, 4, '1.00000', 0, '1');
78
+         (new RoomItem())->store($user->uniqueId, $room->id, 18817, 3, 10, '0.01000', 2, '');
79
+         (new RoomItem())->store($user->uniqueId, $room->id, 18835, 3, 9, '0.00000', 0, '');
80
+         (new RoomItem())->store($user->uniqueId, $room->id, 18835, 3, 11, '0.00000', 0, '');
81
+         (new RoomItem())->store($user->uniqueId, $room->id, 18835, 5, 9, '0.00000', 0, '');
82
+         (new RoomItem())->store($user->uniqueId, $room->id, 18835, 5, 11, '0.00000', 0, '');
83
+
84
+         // Wall Items
85
+         (new RoomItem())->store($user->uniqueId, $room->id, 22988, 0, 0, '0', 0, '', ':w=4,2 l=0,35 l');
86
+         (new RoomItem())->store($user->uniqueId, $room->id, 23163, 0, 0, '0', 0, '1', ':w=4,8 l=0,43 r');
87
+         (new RoomItem())->store($user->uniqueId, $room->id, 23261, 0, 0, '0', 0, '', ':w=2,10 l=2,34 l');
88
+         (new RoomItem())->store($user->uniqueId, $room->id, 23331, 0, 0, '0', 0, '', ':w=2,10 l=2,29 l');
89
+
90
+         return true;
91
+     }
92
+
93
+     /**
94 94
      * Create the Pool Room.
95 95
      *
96 96
      * @param User $user
97 97
      *
98 98
      * @return bool
99 99
      */
100
-    protected function createPoolRoom(User $user): bool
101
-    {
102
-        $room = (new Room())->store("{$user->name}'s room", "{$user->name} has entered the building", 'model_h', 25, 12, 307, 3104, 1.10, $user->uniqueId, $user->name);
103
-
104
-        $user->update(['home_room' => $room->id]);
105
-
106
-        // Floor Items
107
-        (new RoomItem())->store($user->uniqueId, $room->id, 16715, 5, 11, 1.30000, 0, '');
108
-        (new RoomItem())->store($user->uniqueId, $room->id, 16732, 3, 10, 0.40000, 0, '');
109
-        (new RoomItem())->store($user->uniqueId, $room->id, 17016, 3, 9, 0.00000, 2, '1');
110
-        (new RoomItem())->store($user->uniqueId, $room->id, 17016, 3, 11, 0.00000, 0, '');
111
-        (new RoomItem())->store($user->uniqueId, $room->id, 17016, 4, 9, 0.00000, 4, '');
112
-        (new RoomItem())->store($user->uniqueId, $room->id, 17090, 3, 9, 0.00000, 2, '1');
113
-        (new RoomItem())->store($user->uniqueId, $room->id, 17176, 3, 9, 0.00000, 0, '');
114
-        (new RoomItem())->store($user->uniqueId, $room->id, 17176, 3, 9, 0.40000, 0, '');
115
-        (new RoomItem())->store($user->uniqueId, $room->id, 17176, 3, 10, 0.00000, 0, '');
116
-        (new RoomItem())->store($user->uniqueId, $room->id, 17190, 3, 11, 0.00000, 2, '');
117
-        (new RoomItem())->store($user->uniqueId, $room->id, 17190, 4, 9, 0.00000, 4, '');
118
-        (new RoomItem())->store($user->uniqueId, $room->id, 17191, 3, 10, 0.40000, 2, '');
119
-        (new RoomItem())->store($user->uniqueId, $room->id, 17191, 3, 12, 0.00000, 2, '');
120
-        (new RoomItem())->store($user->uniqueId, $room->id, 17484, 8, 3, 1.00000, 0, '0', 0);
121
-        (new RoomItem())->store($user->uniqueId, $room->id, 17499, 7, 3, 1.00000, 2, '');
122
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 7, 2, 1.00000, 0, '');
123
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 7, 4, 1.00000, 0, '');
124
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 7, 5, 1.00000, 0, '');
125
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 8, 2, 1.00000, 0, '');
126
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 8, 5, 1.00000, 0, '');
127
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 9, 2, 1.00000, 0, '');
128
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 9, 5, 1.00000, 0, '');
129
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 2, 1.00000, 0, '');
130
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 3, 1.00000, 0, '');
131
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 4, 1.00000, 0, '');
132
-        (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 5, 1.00000, 0, '');
133
-        (new RoomItem())->store($user->uniqueId, $room->id, 17987, 5, 11, 0.00000, 0, '');
134
-        (new RoomItem())->store($user->uniqueId, $room->id, 18051, 5, 2, 1.00000, 0, '');
135
-        (new RoomItem())->store($user->uniqueId, $room->id, 18051, 5, 4, 1.00000, 0, '');
136
-        (new RoomItem())->store($user->uniqueId, $room->id, 18051, 8, 9, 0.00000, 0, '');
137
-        (new RoomItem())->store($user->uniqueId, $room->id, 18051, 8, 11, 0.00000, 0, '');
138
-        (new RoomItem())->store($user->uniqueId, $room->id, 18051, 9, 9, 0.00000, 0, '');
139
-        (new RoomItem())->store($user->uniqueId, $room->id, 18051, 9, 11, 0.00000, 0, '');
140
-        (new RoomItem())->store($user->uniqueId, $room->id, 18061, 8, 8, 0.00000, 2, '');
141
-        (new RoomItem())->store($user->uniqueId, $room->id, 18061, 8, 9, 0.00000, 6, '1');
142
-        (new RoomItem())->store($user->uniqueId, $room->id, 18061, 10, 8, 0.00000, 4, '1');
143
-        (new RoomItem())->store($user->uniqueId, $room->id, 18070, 8, 2, 1.50000, 0, '1');
144
-        (new RoomItem())->store($user->uniqueId, $room->id, 18079, 9, 8, 0.00000, 0, '1');
145
-        (new RoomItem())->store($user->uniqueId, $room->id, 18363, 3, 9, 0.80000, 0, '2');
146
-
147
-        // Wall Items
148
-        (new RoomItem())->store($user->uniqueId, $room->id, 22996, 0, 0, '0', 0, '', ':w=4,8 l=7,45 r');
149
-        (new RoomItem())->store($user->uniqueId, $room->id, 22996, 0, 0, '0', 0, '', ':w=4,8 l=9,45 l');
150
-        (new RoomItem())->store($user->uniqueId, $room->id, 23063, 0, 0, '0', 0, '', ':w=2,10 l=10,56 l');
151
-        (new RoomItem())->store($user->uniqueId, $room->id, 23063, 0, 0, '0', 0, '', ':w=2,11 l=6,58 l');
152
-        (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '1', ':w=6,1 l=0,26 r');
153
-        (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '3', ':w=7,1 l=4,28 r');
154
-        (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '1', ':w=8,1 l=13,33 r');
155
-        (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '3', ':w=10,1 l=0,26 r');
156
-        (new RoomItem())->store($user->uniqueId, $room->id, 23229, 0, 0, '0', 0, '1', ':w=4,3 l=6,49 l');
157
-        (new RoomItem())->store($user->uniqueId, $room->id, 23229, 0, 0, '0', 0, '1', ':w=4,5 l=11,45 l');
158
-
159
-        return true;
160
-    }
161
-
162
-    /**
100
+     protected function createPoolRoom(User $user): bool
101
+     {
102
+         $room = (new Room())->store("{$user->name}'s room", "{$user->name} has entered the building", 'model_h', 25, 12, 307, 3104, 1.10, $user->uniqueId, $user->name);
103
+
104
+         $user->update(['home_room' => $room->id]);
105
+
106
+         // Floor Items
107
+         (new RoomItem())->store($user->uniqueId, $room->id, 16715, 5, 11, 1.30000, 0, '');
108
+         (new RoomItem())->store($user->uniqueId, $room->id, 16732, 3, 10, 0.40000, 0, '');
109
+         (new RoomItem())->store($user->uniqueId, $room->id, 17016, 3, 9, 0.00000, 2, '1');
110
+         (new RoomItem())->store($user->uniqueId, $room->id, 17016, 3, 11, 0.00000, 0, '');
111
+         (new RoomItem())->store($user->uniqueId, $room->id, 17016, 4, 9, 0.00000, 4, '');
112
+         (new RoomItem())->store($user->uniqueId, $room->id, 17090, 3, 9, 0.00000, 2, '1');
113
+         (new RoomItem())->store($user->uniqueId, $room->id, 17176, 3, 9, 0.00000, 0, '');
114
+         (new RoomItem())->store($user->uniqueId, $room->id, 17176, 3, 9, 0.40000, 0, '');
115
+         (new RoomItem())->store($user->uniqueId, $room->id, 17176, 3, 10, 0.00000, 0, '');
116
+         (new RoomItem())->store($user->uniqueId, $room->id, 17190, 3, 11, 0.00000, 2, '');
117
+         (new RoomItem())->store($user->uniqueId, $room->id, 17190, 4, 9, 0.00000, 4, '');
118
+         (new RoomItem())->store($user->uniqueId, $room->id, 17191, 3, 10, 0.40000, 2, '');
119
+         (new RoomItem())->store($user->uniqueId, $room->id, 17191, 3, 12, 0.00000, 2, '');
120
+         (new RoomItem())->store($user->uniqueId, $room->id, 17484, 8, 3, 1.00000, 0, '0', 0);
121
+         (new RoomItem())->store($user->uniqueId, $room->id, 17499, 7, 3, 1.00000, 2, '');
122
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 7, 2, 1.00000, 0, '');
123
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 7, 4, 1.00000, 0, '');
124
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 7, 5, 1.00000, 0, '');
125
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 8, 2, 1.00000, 0, '');
126
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 8, 5, 1.00000, 0, '');
127
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 9, 2, 1.00000, 0, '');
128
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 9, 5, 1.00000, 0, '');
129
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 2, 1.00000, 0, '');
130
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 3, 1.00000, 0, '');
131
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 4, 1.00000, 0, '');
132
+         (new RoomItem())->store($user->uniqueId, $room->id, 17520, 10, 5, 1.00000, 0, '');
133
+         (new RoomItem())->store($user->uniqueId, $room->id, 17987, 5, 11, 0.00000, 0, '');
134
+         (new RoomItem())->store($user->uniqueId, $room->id, 18051, 5, 2, 1.00000, 0, '');
135
+         (new RoomItem())->store($user->uniqueId, $room->id, 18051, 5, 4, 1.00000, 0, '');
136
+         (new RoomItem())->store($user->uniqueId, $room->id, 18051, 8, 9, 0.00000, 0, '');
137
+         (new RoomItem())->store($user->uniqueId, $room->id, 18051, 8, 11, 0.00000, 0, '');
138
+         (new RoomItem())->store($user->uniqueId, $room->id, 18051, 9, 9, 0.00000, 0, '');
139
+         (new RoomItem())->store($user->uniqueId, $room->id, 18051, 9, 11, 0.00000, 0, '');
140
+         (new RoomItem())->store($user->uniqueId, $room->id, 18061, 8, 8, 0.00000, 2, '');
141
+         (new RoomItem())->store($user->uniqueId, $room->id, 18061, 8, 9, 0.00000, 6, '1');
142
+         (new RoomItem())->store($user->uniqueId, $room->id, 18061, 10, 8, 0.00000, 4, '1');
143
+         (new RoomItem())->store($user->uniqueId, $room->id, 18070, 8, 2, 1.50000, 0, '1');
144
+         (new RoomItem())->store($user->uniqueId, $room->id, 18079, 9, 8, 0.00000, 0, '1');
145
+         (new RoomItem())->store($user->uniqueId, $room->id, 18363, 3, 9, 0.80000, 0, '2');
146
+
147
+         // Wall Items
148
+         (new RoomItem())->store($user->uniqueId, $room->id, 22996, 0, 0, '0', 0, '', ':w=4,8 l=7,45 r');
149
+         (new RoomItem())->store($user->uniqueId, $room->id, 22996, 0, 0, '0', 0, '', ':w=4,8 l=9,45 l');
150
+         (new RoomItem())->store($user->uniqueId, $room->id, 23063, 0, 0, '0', 0, '', ':w=2,10 l=10,56 l');
151
+         (new RoomItem())->store($user->uniqueId, $room->id, 23063, 0, 0, '0', 0, '', ':w=2,11 l=6,58 l');
152
+         (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '1', ':w=6,1 l=0,26 r');
153
+         (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '3', ':w=7,1 l=4,28 r');
154
+         (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '1', ':w=8,1 l=13,33 r');
155
+         (new RoomItem())->store($user->uniqueId, $room->id, 23078, 0, 0, '0', 0, '3', ':w=10,1 l=0,26 r');
156
+         (new RoomItem())->store($user->uniqueId, $room->id, 23229, 0, 0, '0', 0, '1', ':w=4,3 l=6,49 l');
157
+         (new RoomItem())->store($user->uniqueId, $room->id, 23229, 0, 0, '0', 0, '1', ':w=4,5 l=11,45 l');
158
+
159
+         return true;
160
+     }
161
+
162
+     /**
163 163
      * Create the NUX Club Room.
164 164
      *
165 165
      * @param User $user
166 166
      *
167 167
      * @return bool
168 168
      */
169
-    protected function createClubRoom(User $user): bool
170
-    {
171
-        $room = (new Room())->store("{$user->name}'s room", "{$user->name} has entered the building", 'model_h', 25, 12, 409, 1902, 0.0, $user->uniqueId, $user->name);
172
-
173
-        $user->update(['home_room' => $room->id]);
174
-
175
-        // Floor Items
176
-        (new RoomItem())->store($user->uniqueId, $room->id, 16904, 4, 11, '0.00000', 0, '1');
177
-        (new RoomItem())->store($user->uniqueId, $room->id, 16905, 6, 9, '0.00000', 0, '1');
178
-        (new RoomItem())->store($user->uniqueId, $room->id, 16905, 6, 10, '0.00000', 0, '1');
179
-        (new RoomItem())->store($user->uniqueId, $room->id, 16905, 8, 9, '0.00000', 0, '1');
180
-        (new RoomItem())->store($user->uniqueId, $room->id, 16905, 8, 10, '0.00000', 0, '1');
181
-        (new RoomItem())->store($user->uniqueId, $room->id, 16907, 5, 9, '0.00000', 6, '');
182
-        (new RoomItem())->store($user->uniqueId, $room->id, 16907, 5, 10, '0.00000', 6, '');
183
-        (new RoomItem())->store($user->uniqueId, $room->id, 16909, 4, 9, '0.00000', 2, '1');
184
-        (new RoomItem())->store($user->uniqueId, $room->id, 16909, 4, 10, '0.00000', 2, '1');
185
-        (new RoomItem())->store($user->uniqueId, $room->id, 16913, 6, 7, '1.30000', 0, '3');
186
-        (new RoomItem())->store($user->uniqueId, $room->id, 16913, 9, 7, '1.30000', 0, '3');
187
-        (new RoomItem())->store($user->uniqueId, $room->id, 17189, 10, 2, '1.00000', 0, '');
188
-        (new RoomItem())->store($user->uniqueId, $room->id, 17573, 6, 7, '0.00000', 0, '3');
189
-        (new RoomItem())->store($user->uniqueId, $room->id, 17573, 7, 7, '0.00000', 0, '3');
190
-        (new RoomItem())->store($user->uniqueId, $room->id, 17573, 8, 7, '0.00000', 0, '3');
191
-        (new RoomItem())->store($user->uniqueId, $room->id, 17573, 9, 7, '0.00000', 0, '3');
192
-        (new RoomItem())->store($user->uniqueId, $room->id, 18048, 7, 2, '1.00000', 4, '');
193
-        (new RoomItem())->store($user->uniqueId, $room->id, 18082, 6, 3, '1.00000', 2, '');
194
-        (new RoomItem())->store($user->uniqueId, $room->id, 18082, 9, 3, '1.00000', 6, '');
195
-
196
-        // Wall Items
197
-        (new RoomItem())->store($user->uniqueId, $room->id, 23008, 0, 0, '0', 0, '2', ':w=4,8 l=0,27 r');
198
-        (new RoomItem())->store($user->uniqueId, $room->id, 23013, 0, 0, '0', 0, '', ':w=2,10 l=2,44 l');
199
-        (new RoomItem())->store($user->uniqueId, $room->id, 23014, 0, 0, '0', 0, '1', ':w=8,1 l=14,27 r');
200
-        (new RoomItem())->store($user->uniqueId, $room->id, 23236, 0, 0, '0', 0, '1', ':w=6,1 l=5,31 r');
201
-        (new RoomItem())->store($user->uniqueId, $room->id, 23239, 0, 0, '0', 0, '', ':w=4,7 l=4,29 l');
202
-
203
-        return true;
204
-    }
169
+     protected function createClubRoom(User $user): bool
170
+     {
171
+         $room = (new Room())->store("{$user->name}'s room", "{$user->name} has entered the building", 'model_h', 25, 12, 409, 1902, 0.0, $user->uniqueId, $user->name);
172
+
173
+         $user->update(['home_room' => $room->id]);
174
+
175
+         // Floor Items
176
+         (new RoomItem())->store($user->uniqueId, $room->id, 16904, 4, 11, '0.00000', 0, '1');
177
+         (new RoomItem())->store($user->uniqueId, $room->id, 16905, 6, 9, '0.00000', 0, '1');
178
+         (new RoomItem())->store($user->uniqueId, $room->id, 16905, 6, 10, '0.00000', 0, '1');
179
+         (new RoomItem())->store($user->uniqueId, $room->id, 16905, 8, 9, '0.00000', 0, '1');
180
+         (new RoomItem())->store($user->uniqueId, $room->id, 16905, 8, 10, '0.00000', 0, '1');
181
+         (new RoomItem())->store($user->uniqueId, $room->id, 16907, 5, 9, '0.00000', 6, '');
182
+         (new RoomItem())->store($user->uniqueId, $room->id, 16907, 5, 10, '0.00000', 6, '');
183
+         (new RoomItem())->store($user->uniqueId, $room->id, 16909, 4, 9, '0.00000', 2, '1');
184
+         (new RoomItem())->store($user->uniqueId, $room->id, 16909, 4, 10, '0.00000', 2, '1');
185
+         (new RoomItem())->store($user->uniqueId, $room->id, 16913, 6, 7, '1.30000', 0, '3');
186
+         (new RoomItem())->store($user->uniqueId, $room->id, 16913, 9, 7, '1.30000', 0, '3');
187
+         (new RoomItem())->store($user->uniqueId, $room->id, 17189, 10, 2, '1.00000', 0, '');
188
+         (new RoomItem())->store($user->uniqueId, $room->id, 17573, 6, 7, '0.00000', 0, '3');
189
+         (new RoomItem())->store($user->uniqueId, $room->id, 17573, 7, 7, '0.00000', 0, '3');
190
+         (new RoomItem())->store($user->uniqueId, $room->id, 17573, 8, 7, '0.00000', 0, '3');
191
+         (new RoomItem())->store($user->uniqueId, $room->id, 17573, 9, 7, '0.00000', 0, '3');
192
+         (new RoomItem())->store($user->uniqueId, $room->id, 18048, 7, 2, '1.00000', 4, '');
193
+         (new RoomItem())->store($user->uniqueId, $room->id, 18082, 6, 3, '1.00000', 2, '');
194
+         (new RoomItem())->store($user->uniqueId, $room->id, 18082, 9, 3, '1.00000', 6, '');
195
+
196
+         // Wall Items
197
+         (new RoomItem())->store($user->uniqueId, $room->id, 23008, 0, 0, '0', 0, '2', ':w=4,8 l=0,27 r');
198
+         (new RoomItem())->store($user->uniqueId, $room->id, 23013, 0, 0, '0', 0, '', ':w=2,10 l=2,44 l');
199
+         (new RoomItem())->store($user->uniqueId, $room->id, 23014, 0, 0, '0', 0, '1', ':w=8,1 l=14,27 r');
200
+         (new RoomItem())->store($user->uniqueId, $room->id, 23236, 0, 0, '0', 0, '1', ':w=6,1 l=5,31 r');
201
+         (new RoomItem())->store($user->uniqueId, $room->id, 23239, 0, 0, '0', 0, '', ':w=4,7 l=4,29 l');
202
+
203
+         return true;
204
+     }
205 205
 }
Please login to merge, or discard this patch.
app/Models/UserSecurity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
      */
60 60
     public function getTrustedDevicesAttribute(): array
61 61
     {
62
-        return TrustedDevice::where('user_id', $this->attributes['user_id'])->get(['ip_address'])->map(function ($item) {
62
+        return TrustedDevice::where('user_id', $this->attributes['user_id'])->get(['ip_address'])->map(function($item) {
63 63
             return $item->ip_address;
64 64
         })->toArray();
65 65
     }
Please login to merge, or discard this patch.