@@ -99,8 +99,9 @@ |
||
| 99 | 99 | { |
| 100 | 100 | $voucher = DB::table('vouchers')->where('code', $request->json()->get('voucherCode'))->first(); |
| 101 | 101 | |
| 102 | - if ($voucher == null) |
|
| 103 | - return response()->json(null, 404); |
|
| 102 | + if ($voucher == null) { |
|
| 103 | + return response()->json(null, 404); |
|
| 104 | + } |
|
| 104 | 105 | |
| 105 | 106 | DB::table('users')->where('id', $request->user()->uniqueId)->increment('credits', $voucher->credits); |
| 106 | 107 | DB::table('users')->where('id', $request->user()->uniqueId)->increment('pixels', $voucher->points); |
@@ -27,8 +27,9 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | $userData = User::where('username', $request->input('name'))->first(); |
| 29 | 29 | |
| 30 | - if ($userData == null) |
|
| 31 | - return response()->json(null, 404); |
|
| 30 | + if ($userData == null) { |
|
| 31 | + return response()->json(null, 404); |
|
| 32 | + } |
|
| 32 | 33 | |
| 33 | 34 | $userPreferences = UserPreferences::find($userData->uniqueId); |
| 34 | 35 | |
@@ -48,13 +49,15 @@ discard block |
||
| 48 | 49 | { |
| 49 | 50 | $userData = User::find($userId); |
| 50 | 51 | |
| 51 | - if ($userData == null) |
|
| 52 | - return response()->json(null, 404); |
|
| 52 | + if ($userData == null) { |
|
| 53 | + return response()->json(null, 404); |
|
| 54 | + } |
|
| 53 | 55 | |
| 54 | 56 | $userPreferences = UserPreferences::find($userData->uniqueId); |
| 55 | 57 | |
| 56 | - if ($userPreferences != null && $userPreferences->profileVisible == '0') |
|
| 57 | - return response()->json(null, 404); |
|
| 58 | + if ($userPreferences != null && $userPreferences->profileVisible == '0') { |
|
| 59 | + return response()->json(null, 404); |
|
| 60 | + } |
|
| 58 | 61 | |
| 59 | 62 | return response()->json(new UserProfile($userData)); |
| 60 | 63 | } |
@@ -90,8 +93,9 @@ discard block |
||
| 90 | 93 | */ |
| 91 | 94 | public function getPhotos(Request $request): JsonResponse |
| 92 | 95 | { |
| 93 | - if (Photo::where('creator_id', $request->user()->uniqueId)->count() == 0) |
|
| 94 | - return response()->json([]); |
|
| 96 | + if (Photo::where('creator_id', $request->user()->uniqueId)->count() == 0) { |
|
| 97 | + return response()->json([]); |
|
| 98 | + } |
|
| 95 | 99 | |
| 96 | 100 | $userPhotos = Photo::where('creator_id', $request->user()->uniqueId)->get(); |
| 97 | 101 | |
@@ -26,8 +26,9 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function checkName(Request $request): JsonResponse |
| 28 | 28 | { |
| 29 | - if (User::where('username', $request->json()->get('name'))->count() > 0) |
|
| 30 | - return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
| 29 | + if (User::where('username', $request->json()->get('name'))->count() > 0) { |
|
| 30 | + return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
| 31 | + } |
|
| 31 | 32 | |
| 32 | 33 | return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]); |
| 33 | 34 | } |
@@ -75,8 +76,9 @@ discard block |
||
| 75 | 76 | */ |
| 76 | 77 | public function selectRoom(Request $request): JsonResponse |
| 77 | 78 | { |
| 78 | - if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) |
|
| 79 | - return response('', 400); |
|
| 79 | + if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) { |
|
| 80 | + return response('', 400); |
|
| 81 | + } |
|
| 80 | 82 | |
| 81 | 83 | $request->user()->traits = ["USER"]; |
| 82 | 84 | |
@@ -106,8 +108,9 @@ discard block |
||
| 106 | 108 | { |
| 107 | 109 | $userPreferences = UserPreferences::find($request->user()->uniqueId); |
| 108 | 110 | |
| 109 | - foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) |
|
| 110 | - $userPreferences->{$attributeName} = $attributeValue == 1; |
|
| 111 | + foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) { |
|
| 112 | + $userPreferences->{$attributeName} = $attributeValue == 1; |
|
| 113 | + } |
|
| 111 | 114 | |
| 112 | 115 | return response()->json($userPreferences); |
| 113 | 116 | } |
@@ -153,8 +156,9 @@ discard block |
||
| 153 | 156 | */ |
| 154 | 157 | public function checkNewName(Request $request): JsonResponse |
| 155 | 158 | { |
| 156 | - if (User::where('username', $request->input('name'))->count() > 0) |
|
| 157 | - return response()->json(['isAvailable' => false]); |
|
| 159 | + if (User::where('username', $request->input('name'))->count() > 0) { |
|
| 160 | + return response()->json(['isAvailable' => false]); |
|
| 161 | + } |
|
| 158 | 162 | |
| 159 | 163 | return response()->json(['isAvailable' => true]); |
| 160 | 164 | } |
@@ -167,8 +171,9 @@ discard block |
||
| 167 | 171 | */ |
| 168 | 172 | public function createAvatar(Request $request): JsonResponse |
| 169 | 173 | { |
| 170 | - if (User::where('username', $request->json()->get('name'))->count() > 0) |
|
| 171 | - return response()->json(['isAvailable' => false]); |
|
| 174 | + if (User::where('username', $request->json()->get('name'))->count() > 0) { |
|
| 175 | + return response()->json(['isAvailable' => false]); |
|
| 176 | + } |
|
| 172 | 177 | |
| 173 | 178 | $request->user()->name = $request->json()->get('name'); |
| 174 | 179 | |
@@ -228,8 +233,9 @@ discard block |
||
| 228 | 233 | */ |
| 229 | 234 | public function confirmActivation(Request $request): JsonResponse |
| 230 | 235 | { |
| 231 | - if (($mailRequest = (new MailController)->getMail($request->json()->get('token'))) == null) |
|
| 232 | - return response()->json(['error' => 'activation.invalid_token'], 400); |
|
| 236 | + if (($mailRequest = (new MailController)->getMail($request->json()->get('token'))) == null) { |
|
| 237 | + return response()->json(['error' => 'activation.invalid_token'], 400); |
|
| 238 | + } |
|
| 233 | 239 | |
| 234 | 240 | if (strpos($mailRequest->link, 'change-email') !== false): |
| 235 | 241 | $mail = str_replace('change-email/', '', $mailRequest->link); |
@@ -240,8 +246,9 @@ discard block |
||
| 240 | 246 | |
| 241 | 247 | DB::table('users')->where('mail', $mailRequest->mail)->update(['mail_verified' => 1]); |
| 242 | 248 | |
| 243 | - if ($request->user() !== null) |
|
| 244 | - $request->user()->mailVerified = true; |
|
| 249 | + if ($request->user() !== null) { |
|
| 250 | + $request->user()->mailVerified = true; |
|
| 251 | + } |
|
| 245 | 252 | |
| 246 | 253 | return response()->json(['email' => $mailRequest->mail, 'emailVerified' => true, 'identityVerified' => true]); |
| 247 | 254 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function send(array $configuration, string $view = 'habbo-web-mail.confirm-mail') |
| 44 | 44 | { |
| 45 | - Mail::send($view, $configuration, function ($message) use ($configuration) { |
|
| 45 | + Mail::send($view, $configuration, function($message) use ($configuration) { |
|
| 46 | 46 | $message->from(Config::get('chocolatey.contact'), Config::get('chocolatey.name')); |
| 47 | 47 | $message->to($configuration['mail']); |
| 48 | 48 | }); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | { |
| 93 | 93 | $mailRequest = Mail::where('token', $token)->where('used', '0')->first(); |
| 94 | 94 | |
| 95 | - if($mailRequest !== null) |
|
| 95 | + if ($mailRequest !== null) |
|
| 96 | 96 | $mailRequest->update(['used' => '1']); |
| 97 | 97 | |
| 98 | 98 | return $mailRequest; |
@@ -70,8 +70,9 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function forgotPassword(Request $request): JsonResponse |
| 72 | 72 | { |
| 73 | - if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) |
|
| 74 | - return response()->json(''); |
|
| 73 | + if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) { |
|
| 74 | + return response()->json(''); |
|
| 75 | + } |
|
| 75 | 76 | |
| 76 | 77 | $this->send([ |
| 77 | 78 | 'name' => $user->name, |
@@ -92,8 +93,9 @@ discard block |
||
| 92 | 93 | { |
| 93 | 94 | $mailRequest = Mail::where('token', $token)->where('used', '0')->first(); |
| 94 | 95 | |
| 95 | - if($mailRequest !== null) |
|
| 96 | - $mailRequest->update(['used' => '1']); |
|
| 96 | + if($mailRequest !== null) { |
|
| 97 | + $mailRequest->update(['used' => '1']); |
|
| 98 | + } |
|
| 97 | 99 | |
| 98 | 100 | return $mailRequest; |
| 99 | 101 | } |
@@ -71,8 +71,9 @@ |
||
| 71 | 71 | { |
| 72 | 72 | $articleContent = Article::find(substr($articleName, 0, strpos($articleName, '_'))); |
| 73 | 73 | |
| 74 | - if ($articleContent == null) |
|
| 75 | - return response()->json(null, 404); |
|
| 74 | + if ($articleContent == null) { |
|
| 75 | + return response()->json(null, 404); |
|
| 76 | + } |
|
| 76 | 77 | |
| 77 | 78 | return response(view('habbo-web-news.articles-view', [ |
| 78 | 79 | 'article' => $articleContent, |
@@ -28,8 +28,9 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function featureStatus(Request $request): Response |
| 30 | 30 | { |
| 31 | - if ($request->user()->emailVerified == false) |
|
| 32 | - return response('identity_verification_required', 200); |
|
| 31 | + if ($request->user()->emailVerified == false) { |
|
| 32 | + return response('identity_verification_required', 200); |
|
| 33 | + } |
|
| 33 | 34 | |
| 34 | 35 | $featureEnabled = UserSecurity::find($request->user()->uniqueId); |
| 35 | 36 | |
@@ -44,8 +45,9 @@ discard block |
||
| 44 | 45 | */ |
| 45 | 46 | public function saveQuestions(Request $request): JsonResponse |
| 46 | 47 | { |
| 47 | - if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0) |
|
| 48 | - return response()->json(['error' => 'invalid_password'], 400); |
|
| 48 | + if (User::where('password', hash('sha256', $request->json()->get('password')))->count() == 0) { |
|
| 49 | + return response()->json(['error' => 'invalid_password'], 400); |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | UserSecurity::updateOrCreate([ |
| 51 | 53 | 'user_id' => $request->user()->uniqueId, |
@@ -93,12 +95,14 @@ discard block |
||
| 93 | 95 | */ |
| 94 | 96 | public function changePassword(Request $request): JsonResponse |
| 95 | 97 | { |
| 96 | - if (strlen($request->json()->get('password')) < 6) |
|
| 97 | - return response()->json(['error' => 'password.current_password.invalid'], 409); |
|
| 98 | + if (strlen($request->json()->get('password')) < 6) { |
|
| 99 | + return response()->json(['error' => 'password.current_password.invalid'], 409); |
|
| 100 | + } |
|
| 98 | 101 | |
| 99 | 102 | //@TODO: This search the whole base. If anyone has the same password.. This will give error. Is this good? |
| 100 | - if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() >= 1) |
|
| 101 | - return response()->json(['error' => 'password.used_earlier'], 409); |
|
| 103 | + if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() >= 1) { |
|
| 104 | + return response()->json(['error' => 'password.used_earlier'], 409); |
|
| 105 | + } |
|
| 102 | 106 | |
| 103 | 107 | User::find($request->user()->uniqueId)->update(['password' => |
| 104 | 108 | hash('sha256', $request->json()->get('password'))]); |
@@ -114,11 +118,13 @@ discard block |
||
| 114 | 118 | */ |
| 115 | 119 | public function changeMail(Request $request): JsonResponse |
| 116 | 120 | { |
| 117 | - if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) |
|
| 118 | - return response()->json(['error' => 'changeEmail.invalid_password'], 400); |
|
| 121 | + if (User::where('password', hash('sha256', $request->json()->get('currentPassword')))->count() == 0) { |
|
| 122 | + return response()->json(['error' => 'changeEmail.invalid_password'], 400); |
|
| 123 | + } |
|
| 119 | 124 | |
| 120 | - if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) |
|
| 121 | - return response()->json(['error' => 'changeEmail.email_already_in_use'], 400); |
|
| 125 | + if (ChocolateyId::where('mail', $request->json()->get('newEmail'))->count() > 0) { |
|
| 126 | + return response()->json(['error' => 'changeEmail.email_already_in_use'], 400); |
|
| 127 | + } |
|
| 122 | 128 | |
| 123 | 129 | $this->sendChangeMailConfirmation($request); |
| 124 | 130 | |
@@ -159,8 +165,9 @@ discard block |
||
| 159 | 165 | */ |
| 160 | 166 | public function getQuestions(Request $request): JsonResponse |
| 161 | 167 | { |
| 162 | - if (UserSecurity::find($request->user()->uniqueId) == null) |
|
| 163 | - return response()->json(''); |
|
| 168 | + if (UserSecurity::find($request->user()->uniqueId) == null) { |
|
| 169 | + return response()->json(''); |
|
| 170 | + } |
|
| 164 | 171 | |
| 165 | 172 | $userSecurity = UserSecurity::find($request->user()->uniqueId); |
| 166 | 173 | |
@@ -184,8 +191,9 @@ discard block |
||
| 184 | 191 | ->where('firstAnswer', $request->json()->get('answer1')) |
| 185 | 192 | ->where('secondAnswer', $request->json()->get('answer2'))->count() > 0 |
| 186 | 193 | ): |
| 187 | - if ($request->json()->get('trust') == true) |
|
| 188 | - (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save(); |
|
| 194 | + if ($request->json()->get('trust') == true) { |
|
| 195 | + (new TrustedDevice)->store($request->user()->uniqueId, $request->ip())->save(); |
|
| 196 | + } |
|
| 189 | 197 | |
| 190 | 198 | return response()->json(null, 204); |
| 191 | 199 | endif; |
@@ -203,11 +211,13 @@ discard block |
||
| 203 | 211 | { |
| 204 | 212 | $mailRequest = Mail::where('token', $request->json()->get('token'))->where('used', '0')->first(); |
| 205 | 213 | |
| 206 | - if ($mailRequest == null) |
|
| 207 | - return response()->json(null, 404); |
|
| 214 | + if ($mailRequest == null) { |
|
| 215 | + return response()->json(null, 404); |
|
| 216 | + } |
|
| 208 | 217 | |
| 209 | - if (User::where('password', hash('sha256', $request->json()->get('password')))->count() >= 1) |
|
| 210 | - return response()->json(['error' => 'password.used_earlier'], 400); |
|
| 218 | + if (User::where('password', hash('sha256', $request->json()->get('password')))->count() >= 1) { |
|
| 219 | + return response()->json(['error' => 'password.used_earlier'], 400); |
|
| 220 | + } |
|
| 211 | 221 | |
| 212 | 222 | $mailRequest->update(['used' => '1']); |
| 213 | 223 | |