@@ -200,7 +200,7 @@ |
||
| 200 | 200 | * |
| 201 | 201 | * @param Request $request |
| 202 | 202 | * |
| 203 | - * @return mixed |
|
| 203 | + * @return JsonResponse |
|
| 204 | 204 | */ |
| 205 | 205 | public function confirmChangePassword(Request $request): JsonResponse |
| 206 | 206 | { |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | { |
| 346 | 346 | $accountCreated = $this->attributes['account_created'] ?? time(); |
| 347 | 347 | |
| 348 | - return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated); |
|
| 348 | + return date('Y-m-d', $accountCreated) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $accountCreated); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | /** |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | { |
| 358 | 358 | $accountCreated = $this->attributes['account_created'] ?? time(); |
| 359 | 359 | |
| 360 | - return date('Y-m-d', $accountCreated).'T'.date('H:i:s.ZZZZ+ZZZZ', $accountCreated); |
|
| 360 | + return date('Y-m-d', $accountCreated) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $accountCreated); |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | { |
| 380 | 380 | $lastLogin = $this->attributes['last_login'] ?? time(); |
| 381 | 381 | |
| 382 | - return date('Y-m-d', $lastLogin).'T'.date('H:i:s.ZZZZ+ZZZZ', $lastLogin); |
|
| 382 | + return date('Y-m-d', $lastLogin) . 'T' . date('H:i:s.ZZZZ+ZZZZ', $lastLogin); |
|
| 383 | 383 | } |
| 384 | 384 | |
| 385 | 385 | /** |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | */ |
| 81 | 81 | public function getCreationTimeAttribute(): string |
| 82 | 82 | { |
| 83 | - return date('Y-m-d', strtotime($this->attributes['created_at'])).'T'. |
|
| 83 | + return date('Y-m-d', strtotime($this->attributes['created_at'])) . 'T' . |
|
| 84 | 84 | date('H:i:s.ZZZZ+ZZZZ', strtotime($this->attributes['created_at'])); |
| 85 | 85 | } |
| 86 | 86 | |
@@ -55,7 +55,7 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -25,8 +25,7 @@ discard block |
||
| 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 |
||
| 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 | /** |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | protected function filterName(string $userName): bool |
| 52 | 52 | { |
| 53 | - return count(array_filter(Config::get('chocolatey.invalid'), function ($username) use ($userName) { |
|
| 53 | + return count(array_filter(Config::get('chocolatey.invalid'), function($username) use ($userName) { |
|
| 54 | 54 | return strpos($userName, $username) !== false; |
| 55 | 55 | })) == 0; |
| 56 | 56 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | 'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false ? '1' : '0', |
| 150 | 150 | ]); |
| 151 | 151 | |
| 152 | - foreach ((array) $request->json()->all() as $setting => $value) { |
|
| 152 | + foreach ((array)$request->json()->all() as $setting => $value) { |
|
| 153 | 153 | UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | $token = Mail::store($userMail, 'public/registration/activate'); |
| 218 | 218 | |
| 219 | 219 | Mail::send(['email' => $userMail, 'name' => $userName, |
| 220 | - 'url' => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName'), |
|
| 220 | + 'url' => "/activate/{$token}", 'subject' => 'Welcome to ' . Config::get('chocolatey.hotelName'), |
|
| 221 | 221 | ]); |
| 222 | 222 | |
| 223 | 223 | return UserFacade::setSession((new User())->store($userName, $userInfo['password'], $userMail, $request->ip())); |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | { |
| 237 | 237 | $partialName = explode(' ', (new Alliteration())->getName()); |
| 238 | 238 | |
| 239 | - return strtolower($partialName[0].strstr($userMail, '@', true).$partialName[1]); |
|
| 239 | + return strtolower($partialName[0] . strstr($userMail, '@', true) . $partialName[1]); |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | /** |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | $token = Mail::store($request->user()->email, 'public/registration/activate'); |
| 310 | 310 | |
| 311 | 311 | Mail::send(['name' => $request->user()->name, 'email' => $request->user()->email, |
| 312 | - 'url' => "/activate/{$token}", 'subject' => 'Welcome to '.Config::get('chocolatey.hotelName'), |
|
| 312 | + 'url' => "/activate/{$token}", 'subject' => 'Welcome to ' . Config::get('chocolatey.hotelName'), |
|
| 313 | 313 | ]); |
| 314 | 314 | |
| 315 | 315 | return response(null); |
@@ -40,175 +40,175 @@ |
||
| 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 | - $room->save(); |
|
| 63 | - |
|
| 64 | - DB::table('users')->where('id', $user->uniqueId)->update(['home_room' => $room->id]); |
|
| 65 | - |
|
| 66 | - DB::table('items')->insert([ |
|
| 67 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 9, 'y' => 9, 'z' => '0.00000', 'rot' => 4, 'extra_data' => ''], |
|
| 68 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 9, 'y' => 12, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 69 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 10, 'y' => 9, 'z' => '0.00000', 'rot' => 4, 'extra_data' => ''], |
|
| 70 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 10, 'y' => 12, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 71 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16412, 'x' => 9, 'y' => 5, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 72 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16435, 'x' => 7, 'y' => 5, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 73 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16486, 'x' => 8, 'y' => 5, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 74 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17816, 'x' => 6, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '4'], |
|
| 75 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17816, 'x' => 9, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '4'], |
|
| 76 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17824, 'x' => 7, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 77 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17894, 'x' => 9, 'y' => 10, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 78 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18074, 'x' => 8, 'y' => 4, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 79 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18817, 'x' => 3, 'y' => 10, 'z' => '0.01000', 'rot' => 2, 'extra_data' => ''], |
|
| 80 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 3, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 81 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 3, 'y' => 11, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 82 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 5, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 83 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 5, 'y' => 11, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 84 | - ]); |
|
| 85 | - |
|
| 86 | - DB::table('items')->insert([ |
|
| 87 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 22988, 'wall_pos' => ':w=4,2 l=0,35 l', 'extra_data' => ''], |
|
| 88 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23163, 'wall_pos' => ':w=4,8 l=0,43 r', 'extra_data' => '1'], |
|
| 89 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23261, 'wall_pos' => ':w=2,10 l=2,34 l', 'extra_data' => ''], |
|
| 90 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23331, 'wall_pos' => ':w=2,10 l=2,29 l', 'extra_data' => ''], |
|
| 91 | - ]); |
|
| 92 | - |
|
| 93 | - return true; |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - /** |
|
| 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 | + $room->save(); |
|
| 63 | + |
|
| 64 | + DB::table('users')->where('id', $user->uniqueId)->update(['home_room' => $room->id]); |
|
| 65 | + |
|
| 66 | + DB::table('items')->insert([ |
|
| 67 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 9, 'y' => 9, 'z' => '0.00000', 'rot' => 4, 'extra_data' => ''], |
|
| 68 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 9, 'y' => 12, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 69 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 10, 'y' => 9, 'z' => '0.00000', 'rot' => 4, 'extra_data' => ''], |
|
| 70 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 15542, 'x' => 10, 'y' => 12, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 71 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16412, 'x' => 9, 'y' => 5, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 72 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16435, 'x' => 7, 'y' => 5, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 73 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16486, 'x' => 8, 'y' => 5, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 74 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17816, 'x' => 6, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '4'], |
|
| 75 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17816, 'x' => 9, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '4'], |
|
| 76 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17824, 'x' => 7, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 77 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17894, 'x' => 9, 'y' => 10, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 78 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18074, 'x' => 8, 'y' => 4, 'z' => '1.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 79 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18817, 'x' => 3, 'y' => 10, 'z' => '0.01000', 'rot' => 2, 'extra_data' => ''], |
|
| 80 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 3, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 81 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 3, 'y' => 11, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 82 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 5, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 83 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18835, 'x' => 5, 'y' => 11, 'z' => '0.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 84 | + ]); |
|
| 85 | + |
|
| 86 | + DB::table('items')->insert([ |
|
| 87 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 22988, 'wall_pos' => ':w=4,2 l=0,35 l', 'extra_data' => ''], |
|
| 88 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23163, 'wall_pos' => ':w=4,8 l=0,43 r', 'extra_data' => '1'], |
|
| 89 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23261, 'wall_pos' => ':w=2,10 l=2,34 l', 'extra_data' => ''], |
|
| 90 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23331, 'wall_pos' => ':w=2,10 l=2,29 l', 'extra_data' => ''], |
|
| 91 | + ]); |
|
| 92 | + |
|
| 93 | + return true; |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + /** |
|
| 97 | 97 | * Create the Pool Room. |
| 98 | 98 | * |
| 99 | 99 | * @param User $user |
| 100 | 100 | * |
| 101 | 101 | * @return bool |
| 102 | 102 | */ |
| 103 | - protected function createPoolRoom(User $user): bool |
|
| 104 | - { |
|
| 105 | - $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); |
|
| 106 | - $room->save(); |
|
| 107 | - |
|
| 108 | - DB::table('users')->where('id', $user->uniqueId)->update(['home_room' => $room->id]); |
|
| 109 | - |
|
| 110 | - DB::table('items')->insert([ |
|
| 111 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16715, 'x' => 5, 'y' => 11, 'z' => 1.30000, 'rot' => 0, 'extra_data' => ''], |
|
| 112 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16732, 'x' => 3, 'y' => 10, 'z' => 0.40000, 'rot' => 0, 'extra_data' => ''], |
|
| 113 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17016, 'x' => 3, 'y' => 9, 'z' => 0.00000, 'rot' => 2, 'extra_data' => '1'], |
|
| 114 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17016, 'x' => 3, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 115 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17016, 'x' => 4, 'y' => 9, 'z' => 0.00000, 'rot' => 4, 'extra_data' => ''], |
|
| 116 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17090, 'x' => 3, 'y' => 9, 'z' => 0.00000, 'rot' => 2, 'extra_data' => '1'], |
|
| 117 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17176, 'x' => 3, 'y' => 9, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 118 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17176, 'x' => 3, 'y' => 9, 'z' => 0.40000, 'rot' => 0, 'extra_data' => ''], |
|
| 119 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17176, 'x' => 3, 'y' => 10, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 120 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17190, 'x' => 3, 'y' => 11, 'z' => 0.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 121 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17190, 'x' => 4, 'y' => 9, 'z' => 0.00000, 'rot' => 4, 'extra_data' => ''], |
|
| 122 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17191, 'x' => 3, 'y' => 10, 'z' => 0.40000, 'rot' => 2, 'extra_data' => ''], |
|
| 123 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17191, 'x' => 3, 'y' => 12, 'z' => 0.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 124 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17484, 'x' => 8, 'y' => 3, 'z' => 1.00000, 'rot' => 0, 'extra_data' => '0'], |
|
| 125 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17499, 'x' => 7, 'y' => 3, 'z' => 1.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 126 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 7, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 127 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 7, 'y' => 4, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 128 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 7, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 129 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 8, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 130 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 8, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 131 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 9, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 132 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 9, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 133 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 134 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 3, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 135 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 4, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 136 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 137 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17987, 'x' => 5, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 138 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 5, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 139 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 5, 'y' => 4, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 140 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 8, 'y' => 9, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 141 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 8, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 142 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 9, 'y' => 9, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 143 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 9, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 144 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18061, 'x' => 8, 'y' => 8, 'z' => 0.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 145 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18061, 'x' => 8, 'y' => 9, 'z' => 0.00000, 'rot' => 6, 'extra_data' => '1'], |
|
| 146 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18061, 'x' => 10, 'y' => 8, 'z' => 0.00000, 'rot' => 4, 'extra_data' => '1'], |
|
| 147 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18070, 'x' => 8, 'y' => 2, 'z' => 1.50000, 'rot' => 0, 'extra_data' => '1'], |
|
| 148 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18079, 'x' => 9, 'y' => 8, 'z' => 0.00000, 'rot' => 0, 'extra_data' => '1'], |
|
| 149 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18363, 'x' => 3, 'y' => 9, 'z' => 0.80000, 'rot' => 0, 'extra_data' => '2'], |
|
| 150 | - ]); |
|
| 151 | - |
|
| 152 | - DB::table('items')->insert([ |
|
| 153 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 22996, 'wall_pos' => ':w=4,8 l=7,45 r', 'extra_data' => ''], |
|
| 154 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 22996, 'wall_pos' => ':w=4,8 l=9,45 l', 'extra_data' => ''], |
|
| 155 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23063, 'wall_pos' => ':w=2,10 l=10,56 l', 'extra_data' => ''], |
|
| 156 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23063, 'wall_pos' => ':w=2,11 l=6,58 l', 'extra_data' => ''], |
|
| 157 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=6,1 l=0,26 r', 'extra_data' => '1'], |
|
| 158 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=7,1 l=4,28 r', 'extra_data' => '3'], |
|
| 159 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=8,1 l=13,33 r', 'extra_data' => '1'], |
|
| 160 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=10,1 l=0,26 r', 'extra_data' => '3'], |
|
| 161 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23229, 'wall_pos' => ':w=4,3 l=6,49 l', 'extra_data' => '1'], |
|
| 162 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23229, 'wall_pos' => ':w=4,5 l=11,45 l', 'extra_data' => '1'], |
|
| 163 | - ]); |
|
| 164 | - |
|
| 165 | - return true; |
|
| 166 | - } |
|
| 167 | - |
|
| 168 | - /** |
|
| 103 | + protected function createPoolRoom(User $user): bool |
|
| 104 | + { |
|
| 105 | + $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); |
|
| 106 | + $room->save(); |
|
| 107 | + |
|
| 108 | + DB::table('users')->where('id', $user->uniqueId)->update(['home_room' => $room->id]); |
|
| 109 | + |
|
| 110 | + DB::table('items')->insert([ |
|
| 111 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16715, 'x' => 5, 'y' => 11, 'z' => 1.30000, 'rot' => 0, 'extra_data' => ''], |
|
| 112 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16732, 'x' => 3, 'y' => 10, 'z' => 0.40000, 'rot' => 0, 'extra_data' => ''], |
|
| 113 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17016, 'x' => 3, 'y' => 9, 'z' => 0.00000, 'rot' => 2, 'extra_data' => '1'], |
|
| 114 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17016, 'x' => 3, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 115 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17016, 'x' => 4, 'y' => 9, 'z' => 0.00000, 'rot' => 4, 'extra_data' => ''], |
|
| 116 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17090, 'x' => 3, 'y' => 9, 'z' => 0.00000, 'rot' => 2, 'extra_data' => '1'], |
|
| 117 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17176, 'x' => 3, 'y' => 9, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 118 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17176, 'x' => 3, 'y' => 9, 'z' => 0.40000, 'rot' => 0, 'extra_data' => ''], |
|
| 119 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17176, 'x' => 3, 'y' => 10, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 120 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17190, 'x' => 3, 'y' => 11, 'z' => 0.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 121 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17190, 'x' => 4, 'y' => 9, 'z' => 0.00000, 'rot' => 4, 'extra_data' => ''], |
|
| 122 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17191, 'x' => 3, 'y' => 10, 'z' => 0.40000, 'rot' => 2, 'extra_data' => ''], |
|
| 123 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17191, 'x' => 3, 'y' => 12, 'z' => 0.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 124 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17484, 'x' => 8, 'y' => 3, 'z' => 1.00000, 'rot' => 0, 'extra_data' => '0'], |
|
| 125 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17499, 'x' => 7, 'y' => 3, 'z' => 1.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 126 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 7, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 127 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 7, 'y' => 4, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 128 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 7, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 129 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 8, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 130 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 8, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 131 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 9, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 132 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 9, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 133 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 134 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 3, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 135 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 4, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 136 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17520, 'x' => 10, 'y' => 5, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 137 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17987, 'x' => 5, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 138 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 5, 'y' => 2, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 139 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 5, 'y' => 4, 'z' => 1.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 140 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 8, 'y' => 9, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 141 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 8, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 142 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 9, 'y' => 9, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 143 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18051, 'x' => 9, 'y' => 11, 'z' => 0.00000, 'rot' => 0, 'extra_data' => ''], |
|
| 144 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18061, 'x' => 8, 'y' => 8, 'z' => 0.00000, 'rot' => 2, 'extra_data' => ''], |
|
| 145 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18061, 'x' => 8, 'y' => 9, 'z' => 0.00000, 'rot' => 6, 'extra_data' => '1'], |
|
| 146 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18061, 'x' => 10, 'y' => 8, 'z' => 0.00000, 'rot' => 4, 'extra_data' => '1'], |
|
| 147 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18070, 'x' => 8, 'y' => 2, 'z' => 1.50000, 'rot' => 0, 'extra_data' => '1'], |
|
| 148 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18079, 'x' => 9, 'y' => 8, 'z' => 0.00000, 'rot' => 0, 'extra_data' => '1'], |
|
| 149 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18363, 'x' => 3, 'y' => 9, 'z' => 0.80000, 'rot' => 0, 'extra_data' => '2'], |
|
| 150 | + ]); |
|
| 151 | + |
|
| 152 | + DB::table('items')->insert([ |
|
| 153 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 22996, 'wall_pos' => ':w=4,8 l=7,45 r', 'extra_data' => ''], |
|
| 154 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 22996, 'wall_pos' => ':w=4,8 l=9,45 l', 'extra_data' => ''], |
|
| 155 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23063, 'wall_pos' => ':w=2,10 l=10,56 l', 'extra_data' => ''], |
|
| 156 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23063, 'wall_pos' => ':w=2,11 l=6,58 l', 'extra_data' => ''], |
|
| 157 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=6,1 l=0,26 r', 'extra_data' => '1'], |
|
| 158 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=7,1 l=4,28 r', 'extra_data' => '3'], |
|
| 159 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=8,1 l=13,33 r', 'extra_data' => '1'], |
|
| 160 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23078, 'wall_pos' => ':w=10,1 l=0,26 r', 'extra_data' => '3'], |
|
| 161 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23229, 'wall_pos' => ':w=4,3 l=6,49 l', 'extra_data' => '1'], |
|
| 162 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23229, 'wall_pos' => ':w=4,5 l=11,45 l', 'extra_data' => '1'], |
|
| 163 | + ]); |
|
| 164 | + |
|
| 165 | + return true; |
|
| 166 | + } |
|
| 167 | + |
|
| 168 | + /** |
|
| 169 | 169 | * Create the NUX Club Room. |
| 170 | 170 | * |
| 171 | 171 | * @param User $user |
| 172 | 172 | * |
| 173 | 173 | * @return bool |
| 174 | 174 | */ |
| 175 | - protected function createClubRoom(User $user): bool |
|
| 176 | - { |
|
| 177 | - $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); |
|
| 178 | - $room->save(); |
|
| 179 | - |
|
| 180 | - DB::table('users')->where('id', $user->uniqueId)->update(['home_room' => $room->id]); |
|
| 181 | - |
|
| 182 | - DB::table('items')->insert([ |
|
| 183 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16904, 'x' => 4, 'y' => 11, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 184 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 6, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 185 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 6, 'y' => 10, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 186 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 8, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 187 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 8, 'y' => 10, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 188 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16907, 'x' => 5, 'y' => 9, 'z' => '0.00000', 'rot' => 6, 'extra_data' => ''], |
|
| 189 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16907, 'x' => 5, 'y' => 10, 'z' => '0.00000', 'rot' => 6, 'extra_data' => ''], |
|
| 190 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16909, 'x' => 4, 'y' => 9, 'z' => '0.00000', 'rot' => 2, 'extra_data' => '1'], |
|
| 191 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16909, 'x' => 4, 'y' => 10, 'z' => '0.00000', 'rot' => 2, 'extra_data' => '1'], |
|
| 192 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16913, 'x' => 6, 'y' => 7, 'z' => '1.30000', 'rot' => 0, 'extra_data' => '3'], |
|
| 193 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16913, 'x' => 9, 'y' => 7, 'z' => '1.30000', 'rot' => 0, 'extra_data' => '3'], |
|
| 194 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17189, 'x' => 10, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 195 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 6, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 196 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 7, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 197 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 8, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 198 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 9, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 199 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18048, 'x' => 7, 'y' => 2, 'z' => '1.00000', 'rot' => 4, 'extra_data' => ''], |
|
| 200 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18082, 'x' => 6, 'y' => 3, 'z' => '1.00000', 'rot' => 2, 'extra_data' => ''], |
|
| 201 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18082, 'x' => 9, 'y' => 3, 'z' => '1.00000', 'rot' => 6, 'extra_data' => ''], |
|
| 202 | - ]); |
|
| 203 | - |
|
| 204 | - DB::table('items')->insert([ |
|
| 205 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23008, 'wall_pos' => ':w=4,8 l=0,27 r', 'extra_data' => '2'], |
|
| 206 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23013, 'wall_pos' => ':w=2,10 l=2,44 l', 'extra_data' => ''], |
|
| 207 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23014, 'wall_pos' => ':w=8,1 l=14,27 r', 'extra_data' => '1'], |
|
| 208 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23236, 'wall_pos' => ':w=6,1 l=5,31 r', 'extra_data' => '1'], |
|
| 209 | - ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23239, 'wall_pos' => ':w=4,7 l=4,29 l', 'extra_data' => ''], |
|
| 210 | - ]); |
|
| 211 | - |
|
| 212 | - return true; |
|
| 213 | - } |
|
| 175 | + protected function createClubRoom(User $user): bool |
|
| 176 | + { |
|
| 177 | + $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); |
|
| 178 | + $room->save(); |
|
| 179 | + |
|
| 180 | + DB::table('users')->where('id', $user->uniqueId)->update(['home_room' => $room->id]); |
|
| 181 | + |
|
| 182 | + DB::table('items')->insert([ |
|
| 183 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16904, 'x' => 4, 'y' => 11, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 184 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 6, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 185 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 6, 'y' => 10, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 186 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 8, 'y' => 9, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 187 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16905, 'x' => 8, 'y' => 10, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '1'], |
|
| 188 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16907, 'x' => 5, 'y' => 9, 'z' => '0.00000', 'rot' => 6, 'extra_data' => ''], |
|
| 189 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16907, 'x' => 5, 'y' => 10, 'z' => '0.00000', 'rot' => 6, 'extra_data' => ''], |
|
| 190 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16909, 'x' => 4, 'y' => 9, 'z' => '0.00000', 'rot' => 2, 'extra_data' => '1'], |
|
| 191 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16909, 'x' => 4, 'y' => 10, 'z' => '0.00000', 'rot' => 2, 'extra_data' => '1'], |
|
| 192 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16913, 'x' => 6, 'y' => 7, 'z' => '1.30000', 'rot' => 0, 'extra_data' => '3'], |
|
| 193 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 16913, 'x' => 9, 'y' => 7, 'z' => '1.30000', 'rot' => 0, 'extra_data' => '3'], |
|
| 194 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17189, 'x' => 10, 'y' => 2, 'z' => '1.00000', 'rot' => 0, 'extra_data' => ''], |
|
| 195 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 6, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 196 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 7, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 197 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 8, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 198 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 17573, 'x' => 9, 'y' => 7, 'z' => '0.00000', 'rot' => 0, 'extra_data' => '3'], |
|
| 199 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18048, 'x' => 7, 'y' => 2, 'z' => '1.00000', 'rot' => 4, 'extra_data' => ''], |
|
| 200 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18082, 'x' => 6, 'y' => 3, 'z' => '1.00000', 'rot' => 2, 'extra_data' => ''], |
|
| 201 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 18082, 'x' => 9, 'y' => 3, 'z' => '1.00000', 'rot' => 6, 'extra_data' => ''], |
|
| 202 | + ]); |
|
| 203 | + |
|
| 204 | + DB::table('items')->insert([ |
|
| 205 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23008, 'wall_pos' => ':w=4,8 l=0,27 r', 'extra_data' => '2'], |
|
| 206 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23013, 'wall_pos' => ':w=2,10 l=2,44 l', 'extra_data' => ''], |
|
| 207 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23014, 'wall_pos' => ':w=8,1 l=14,27 r', 'extra_data' => '1'], |
|
| 208 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23236, 'wall_pos' => ':w=6,1 l=5,31 r', 'extra_data' => '1'], |
|
| 209 | + ['user_id' => $user->uniqueId, 'room_id' => $room->id, 'item_id' => 23239, 'wall_pos' => ':w=4,7 l=4,29 l', 'extra_data' => ''], |
|
| 210 | + ]); |
|
| 211 | + |
|
| 212 | + return true; |
|
| 213 | + } |
|
| 214 | 214 | } |
@@ -1,91 +1,91 @@ discard block |
||
| 1 | -<?php |
|
| 1 | + <?php |
|
| 2 | 2 | |
| 3 | -namespace App\Helpers; |
|
| 3 | + namespace App\Helpers; |
|
| 4 | 4 | |
| 5 | -use App\Facades\Session; |
|
| 6 | -use App\Models\User as UserModel; |
|
| 7 | -use Illuminate\Http\Request; |
|
| 8 | -use Illuminate\Support\Facades\Config; |
|
| 5 | + use App\Facades\Session; |
|
| 6 | + use App\Models\User as UserModel; |
|
| 7 | + use Illuminate\Http\Request; |
|
| 8 | + use Illuminate\Support\Facades\Config; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Class User. |
| 12 | 12 | */ |
| 13 | -class User |
|
| 14 | -{ |
|
| 15 | - /** |
|
| 13 | + class User |
|
| 14 | + { |
|
| 15 | + /** |
|
| 16 | 16 | * Quick Way to Get User Data. |
| 17 | 17 | * |
| 18 | 18 | * @return UserModel|null |
| 19 | 19 | */ |
| 20 | - public function getUser() |
|
| 21 | - { |
|
| 22 | - return self::getInstance()->getSession(); |
|
| 23 | - } |
|
| 20 | + public function getUser() |
|
| 21 | + { |
|
| 22 | + return self::getInstance()->getSession(); |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - /** |
|
| 25 | + /** |
|
| 26 | 26 | * Get User Data from Session |
| 27 | 27 | * If User Session doesn't exists, return null. |
| 28 | 28 | * |
| 29 | 29 | * @return UserModel|null |
| 30 | 30 | */ |
| 31 | - public function getSession() |
|
| 32 | - { |
|
| 33 | - return Session::get(Config::get('chocolatey.security.session')) ?? null; |
|
| 34 | - } |
|
| 31 | + public function getSession() |
|
| 32 | + { |
|
| 33 | + return Session::get(Config::get('chocolatey.security.session')) ?? null; |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - /** |
|
| 36 | + /** |
|
| 37 | 37 | * Create and return a User instance. |
| 38 | 38 | * |
| 39 | 39 | * @return User |
| 40 | 40 | */ |
| 41 | - public static function getInstance() |
|
| 42 | - { |
|
| 43 | - static $instance = null; |
|
| 41 | + public static function getInstance() |
|
| 42 | + { |
|
| 43 | + static $instance = null; |
|
| 44 | 44 | |
| 45 | - if ($instance === null) { |
|
| 46 | - $instance = new static(); |
|
| 47 | - } |
|
| 45 | + if ($instance === null) { |
|
| 46 | + $instance = new static(); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - return $instance; |
|
| 50 | - } |
|
| 49 | + return $instance; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 52 | + /** |
|
| 53 | 53 | * Quick Way to Update User Data. |
| 54 | 54 | * |
| 55 | 55 | * @param array $parameters |
| 56 | 56 | * |
| 57 | 57 | * @return UserModel |
| 58 | 58 | */ |
| 59 | - public function updateUser(array $parameters) |
|
| 60 | - { |
|
| 61 | - return self::getInstance()->updateSession($parameters); |
|
| 62 | - } |
|
| 59 | + public function updateUser(array $parameters) |
|
| 60 | + { |
|
| 61 | + return self::getInstance()->updateSession($parameters); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 64 | + /** |
|
| 65 | 65 | * Update User Data without overwriting Session. |
| 66 | 66 | * |
| 67 | 67 | * @param array $parameters |
| 68 | 68 | * |
| 69 | 69 | * @return UserModel |
| 70 | 70 | */ |
| 71 | - public function updateSession(array $parameters) |
|
| 72 | - { |
|
| 73 | - return $this->setSession($this->updateData($this->getSession(), $parameters)); |
|
| 74 | - } |
|
| 71 | + public function updateSession(array $parameters) |
|
| 72 | + { |
|
| 73 | + return $this->setSession($this->updateData($this->getSession(), $parameters)); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - /** |
|
| 76 | + /** |
|
| 77 | 77 | * Set User Data on Session. |
| 78 | 78 | * |
| 79 | 79 | * @param UserModel $user |
| 80 | 80 | * |
| 81 | 81 | * @return UserModel |
| 82 | 82 | */ |
| 83 | - public function setSession(UserModel $user) |
|
| 84 | - { |
|
| 85 | - return Session::set(Config::get('chocolatey.security.session'), $user); |
|
| 86 | - } |
|
| 83 | + public function setSession(UserModel $user) |
|
| 84 | + { |
|
| 85 | + return Session::set(Config::get('chocolatey.security.session'), $user); |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - /** |
|
| 88 | + /** |
|
| 89 | 89 | * Update User Data by User Model. |
| 90 | 90 | * |
| 91 | 91 | * @param UserModel $user |
@@ -93,43 +93,43 @@ discard block |
||
| 93 | 93 | * |
| 94 | 94 | * @return UserModel |
| 95 | 95 | */ |
| 96 | - public function updateData(UserModel $user, array $parameters) |
|
| 97 | - { |
|
| 98 | - $user->update($parameters); |
|
| 96 | + public function updateData(UserModel $user, array $parameters) |
|
| 97 | + { |
|
| 98 | + $user->update($parameters); |
|
| 99 | 99 | |
| 100 | - return $user; |
|
| 101 | - } |
|
| 100 | + return $user; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - /** |
|
| 103 | + /** |
|
| 104 | 104 | * Set Session From Login Credentials. |
| 105 | 105 | * |
| 106 | 106 | * @param Request $request |
| 107 | 107 | * |
| 108 | 108 | * @return UserModel |
| 109 | 109 | */ |
| 110 | - public function loginUser(Request $request) |
|
| 111 | - { |
|
| 112 | - $user = UserModel::where('mail', $request->json()->get('email'))->where('password', |
|
| 113 | - hash(Config::get('chocolatey.security.hash'), $request->json()->get('password')))->first(); |
|
| 110 | + public function loginUser(Request $request) |
|
| 111 | + { |
|
| 112 | + $user = UserModel::where('mail', $request->json()->get('email'))->where('password', |
|
| 113 | + hash(Config::get('chocolatey.security.hash'), $request->json()->get('password')))->first(); |
|
| 114 | 114 | |
| 115 | - return $user != null ? $this->setSession($user) : null; |
|
| 116 | - } |
|
| 115 | + return $user != null ? $this->setSession($user) : null; |
|
| 116 | + } |
|
| 117 | 117 | |
| 118 | - /** |
|
| 118 | + /** |
|
| 119 | 119 | * Return if USer Session Exists. |
| 120 | 120 | * |
| 121 | 121 | * @return bool |
| 122 | 122 | */ |
| 123 | - public function hasSession() |
|
| 124 | - { |
|
| 125 | - return (bool) Session::get(Config::get('chocolatey.security.session')); |
|
| 126 | - } |
|
| 123 | + public function hasSession() |
|
| 124 | + { |
|
| 125 | + return (bool) Session::get(Config::get('chocolatey.security.session')); |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - /** |
|
| 128 | + /** |
|
| 129 | 129 | * Erase User Session. |
| 130 | 130 | */ |
| 131 | - public function eraseSession() |
|
| 132 | - { |
|
| 133 | - Session::erase(Config::get('chocolatey.security.session')); |
|
| 134 | - } |
|
| 131 | + public function eraseSession() |
|
| 132 | + { |
|
| 133 | + Session::erase(Config::get('chocolatey.security.session')); |
|
| 134 | + } |
|
| 135 | 135 | } |
@@ -122,7 +122,7 @@ |
||
| 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 | /** |
@@ -1,78 +1,78 @@ discard block |
||
| 1 | -<?php |
|
| 1 | + <?php |
|
| 2 | 2 | |
| 3 | -namespace App\Helpers; |
|
| 3 | + namespace App\Helpers; |
|
| 4 | 4 | |
| 5 | -use App\Models\Mail as MailModel; |
|
| 6 | -use Illuminate\Support\Facades\Config; |
|
| 7 | -use Illuminate\Support\Facades\Mail as MailFacade; |
|
| 5 | + use App\Models\Mail as MailModel; |
|
| 6 | + use Illuminate\Support\Facades\Config; |
|
| 7 | + use Illuminate\Support\Facades\Mail as MailFacade; |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * Class Mail. |
| 11 | 11 | */ |
| 12 | -class Mail |
|
| 13 | -{ |
|
| 14 | - /** |
|
| 12 | + class Mail |
|
| 13 | + { |
|
| 14 | + /** |
|
| 15 | 15 | * Stored Mail Model. |
| 16 | 16 | * |
| 17 | 17 | * @var MailModel|null |
| 18 | 18 | */ |
| 19 | - protected $mailModel = null; |
|
| 19 | + protected $mailModel = null; |
|
| 20 | 20 | |
| 21 | - /** |
|
| 21 | + /** |
|
| 22 | 22 | * Quick Way to get Cached MailModel. |
| 23 | 23 | * |
| 24 | 24 | * @return MailModel|null |
| 25 | 25 | */ |
| 26 | - public function getMail() |
|
| 27 | - { |
|
| 28 | - return self::getInstance()->get(); |
|
| 29 | - } |
|
| 26 | + public function getMail() |
|
| 27 | + { |
|
| 28 | + return self::getInstance()->get(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 31 | + /** |
|
| 32 | 32 | * Return cached Mail Model. |
| 33 | 33 | * |
| 34 | 34 | * @return MailModel|null |
| 35 | 35 | */ |
| 36 | - public function get() |
|
| 37 | - { |
|
| 38 | - return $this->mailModel; |
|
| 39 | - } |
|
| 36 | + public function get() |
|
| 37 | + { |
|
| 38 | + return $this->mailModel; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 41 | + /** |
|
| 42 | 42 | * Create and return a Mail instance. |
| 43 | 43 | * |
| 44 | 44 | * @return Mail |
| 45 | 45 | */ |
| 46 | - public static function getInstance() |
|
| 47 | - { |
|
| 48 | - static $instance = null; |
|
| 46 | + public static function getInstance() |
|
| 47 | + { |
|
| 48 | + static $instance = null; |
|
| 49 | 49 | |
| 50 | - if ($instance === null) { |
|
| 51 | - $instance = new static(); |
|
| 52 | - } |
|
| 50 | + if ($instance === null) { |
|
| 51 | + $instance = new static(); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - return $instance; |
|
| 55 | - } |
|
| 54 | + return $instance; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - /** |
|
| 57 | + /** |
|
| 58 | 58 | * Send an Email. |
| 59 | 59 | * |
| 60 | 60 | * @param array $configuration |
| 61 | 61 | * @param string $view |
| 62 | 62 | */ |
| 63 | - public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail') |
|
| 64 | - { |
|
| 65 | - if (Config::get('mail.enable') == false) { |
|
| 66 | - return; |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - MailFacade::send($view, $configuration, function ($message) use ($configuration) { |
|
| 70 | - $message->from(Config::get('mail.from.address'), Config::get('mail.from.name')); |
|
| 71 | - $message->to($configuration['email'])->subject($configuration['subject']); |
|
| 72 | - }); |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - /** |
|
| 63 | + public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail') |
|
| 64 | + { |
|
| 65 | + if (Config::get('mail.enable') == false) { |
|
| 66 | + return; |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + MailFacade::send($view, $configuration, function ($message) use ($configuration) { |
|
| 70 | + $message->from(Config::get('mail.from.address'), Config::get('mail.from.name')); |
|
| 71 | + $message->to($configuration['email'])->subject($configuration['subject']); |
|
| 72 | + }); |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + /** |
|
| 76 | 76 | * Store an E-mail. |
| 77 | 77 | * |
| 78 | 78 | * @param string $email |
@@ -80,14 +80,14 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @return string |
| 82 | 82 | */ |
| 83 | - public function store(string $email, string $url): string |
|
| 84 | - { |
|
| 85 | - (new MailModel())->store($token = uniqid('HabboMail', true), $url, $email)->save(); |
|
| 83 | + public function store(string $email, string $url): string |
|
| 84 | + { |
|
| 85 | + (new MailModel())->store($token = uniqid('HabboMail', true), $url, $email)->save(); |
|
| 86 | 86 | |
| 87 | - return $token; |
|
| 88 | - } |
|
| 87 | + return $token; |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - /** |
|
| 90 | + /** |
|
| 91 | 91 | * Update Mail Model Data. |
| 92 | 92 | * |
| 93 | 93 | * @param string $token |
@@ -95,52 +95,52 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @return MailModel |
| 97 | 97 | */ |
| 98 | - public function update(string $token, array $parameters) |
|
| 99 | - { |
|
| 100 | - $mail = $this->get($token); |
|
| 98 | + public function update(string $token, array $parameters) |
|
| 99 | + { |
|
| 100 | + $mail = $this->get($token); |
|
| 101 | 101 | |
| 102 | - $mail->update($parameters); |
|
| 102 | + $mail->update($parameters); |
|
| 103 | 103 | |
| 104 | - return $mail; |
|
| 105 | - } |
|
| 104 | + return $mail; |
|
| 105 | + } |
|
| 106 | 106 | |
| 107 | - /** |
|
| 107 | + /** |
|
| 108 | 108 | * Return if Exists E-Mail with that Token. |
| 109 | 109 | * |
| 110 | 110 | * @param string $token |
| 111 | 111 | * |
| 112 | 112 | * @return bool |
| 113 | 113 | */ |
| 114 | - public function has(string $token) |
|
| 115 | - { |
|
| 116 | - return self::getInstance()->getByToken($token) !== null; |
|
| 117 | - } |
|
| 114 | + public function has(string $token) |
|
| 115 | + { |
|
| 116 | + return self::getInstance()->getByToken($token) !== null; |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | - /** |
|
| 119 | + /** |
|
| 120 | 120 | * Get an E-mail by Token. |
| 121 | 121 | * |
| 122 | 122 | * @param string $token |
| 123 | 123 | * |
| 124 | 124 | * @return MailModel |
| 125 | 125 | */ |
| 126 | - public function getByToken(string $token) |
|
| 127 | - { |
|
| 128 | - $mailRequest = MailModel::where('token', $token)->where('used', '0')->first(); |
|
| 126 | + public function getByToken(string $token) |
|
| 127 | + { |
|
| 128 | + $mailRequest = MailModel::where('token', $token)->where('used', '0')->first(); |
|
| 129 | 129 | |
| 130 | - $mailRequest->update(['used' => '1']); |
|
| 130 | + $mailRequest->update(['used' => '1']); |
|
| 131 | 131 | |
| 132 | - return $this->set($mailRequest); |
|
| 133 | - } |
|
| 132 | + return $this->set($mailRequest); |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - /** |
|
| 135 | + /** |
|
| 136 | 136 | * Set Mail Model in Cache. |
| 137 | 137 | * |
| 138 | 138 | * @param MailModel $model |
| 139 | 139 | * |
| 140 | 140 | * @return MailModel |
| 141 | 141 | */ |
| 142 | - public function set(MailModel $model) |
|
| 143 | - { |
|
| 144 | - return $this->mailModel = $model; |
|
| 145 | - } |
|
| 142 | + public function set(MailModel $model) |
|
| 143 | + { |
|
| 144 | + return $this->mailModel = $model; |
|
| 145 | + } |
|
| 146 | 146 | } |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | return; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - MailFacade::send($view, $configuration, function ($message) use ($configuration) { |
|
| 69 | + MailFacade::send($view, $configuration, function($message) use ($configuration) { |
|
| 70 | 70 | $message->from(Config::get('mail.from.address'), Config::get('mail.from.name')); |
| 71 | 71 | $message->to($configuration['email'])->subject($configuration['subject']); |
| 72 | 72 | }); |