|
@@ -39,11 +39,13 @@ discard block |
|
|
block discarded – undo |
|
39
|
39
|
*/ |
|
40
|
40
|
public function checkName(Request $request): JsonResponse |
|
41
|
41
|
{ |
|
42
|
|
- if (User::where('username', $request->json()->get('name'))->count() > 0 && $request->json()->get('name') != $request->user()->name) |
|
43
|
|
- return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
|
42
|
+ if (User::where('username', $request->json()->get('name'))->count() > 0 && $request->json()->get('name') != $request->user()->name) { |
|
|
43
|
+ return response()->json(['code' => 'NAME_IN_USE', 'validationResult' => null, 'suggestions' => []]); |
|
|
44
|
+ } |
|
44
|
45
|
|
|
45
|
|
- if (strlen($request->json()->get('name')) > 50 || !$this->filterName($request->json()->get('name'))) |
|
46
|
|
- return response()->json(['code' => 'INVALID_NAME', 'validationResult' => ['resultType' => 'VALIDATION_ERROR_ILLEGAL_WORDS'], 'suggestions' => []]); |
|
|
46
|
+ if (strlen($request->json()->get('name')) > 50 || !$this->filterName($request->json()->get('name'))) { |
|
|
47
|
+ return response()->json(['code' => 'INVALID_NAME', 'validationResult' => ['resultType' => 'VALIDATION_ERROR_ILLEGAL_WORDS'], 'suggestions' => []]); |
|
|
48
|
+ } |
|
47
|
49
|
|
|
48
|
50
|
return response()->json(['code' => 'OK', 'validationResult' => null, 'suggestions' => []]); |
|
49
|
51
|
} |
|
@@ -91,8 +93,9 @@ discard block |
|
|
block discarded – undo |
|
91
|
93
|
*/ |
|
92
|
94
|
public function selectRoom(Request $request): JsonResponse |
|
93
|
95
|
{ |
|
94
|
|
- if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) |
|
95
|
|
- return response(null, 400); |
|
|
96
|
+ if (!in_array($request->json()->get('roomIndex'), [1, 2, 3])) { |
|
|
97
|
+ return response(null, 400); |
|
|
98
|
+ } |
|
96
|
99
|
|
|
97
|
100
|
$request->user()->traits = ["USER"]; |
|
98
|
101
|
|
|
@@ -122,8 +125,9 @@ discard block |
|
|
block discarded – undo |
|
122
|
125
|
{ |
|
123
|
126
|
$userPreferences = UserPreferences::find($request->user()->uniqueId); |
|
124
|
127
|
|
|
125
|
|
- foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) |
|
126
|
|
- $userPreferences->{$attributeName} = $attributeValue == 1; |
|
|
128
|
+ foreach ($userPreferences->getAttributes() as $attributeName => $attributeValue) { |
|
|
129
|
+ $userPreferences->{$attributeName} = $attributeValue == 1; |
|
|
130
|
+ } |
|
127
|
131
|
|
|
128
|
132
|
return response()->json($userPreferences); |
|
129
|
133
|
} |
|
@@ -141,8 +145,9 @@ discard block |
|
|
block discarded – undo |
|
141
|
145
|
'block_friendrequests' => $request->json()->get('friendRequestEnabled') == false |
|
142
|
146
|
]); |
|
143
|
147
|
|
|
144
|
|
- foreach((array)$request->json()->all() as $setting => $value) |
|
145
|
|
- UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']); |
|
|
148
|
+ foreach((array)$request->json()->all() as $setting => $value) { |
|
|
149
|
+ UserPreferences::find($request->user()->uniqueId)->update([$setting => $value == true ? '1' : '0']); |
|
|
150
|
+ } |
|
146
|
151
|
|
|
147
|
152
|
return response()->json(null); |
|
148
|
153
|
} |
|
@@ -169,8 +174,9 @@ discard block |
|
|
block discarded – undo |
|
169
|
174
|
*/ |
|
170
|
175
|
public function checkNewName(Request $request): JsonResponse |
|
171
|
176
|
{ |
|
172
|
|
- if (User::where('username', $request->input('name'))->count() > 0 || !$this->filterName($request->input('name'))) |
|
173
|
|
- return response()->json(['isAvailable' => false]); |
|
|
177
|
+ if (User::where('username', $request->input('name'))->count() > 0 || !$this->filterName($request->input('name'))) { |
|
|
178
|
+ return response()->json(['isAvailable' => false]); |
|
|
179
|
+ } |
|
174
|
180
|
|
|
175
|
181
|
return response()->json(['isAvailable' => true]); |
|
176
|
182
|
} |
|
@@ -183,8 +189,9 @@ discard block |
|
|
block discarded – undo |
|
183
|
189
|
*/ |
|
184
|
190
|
public function createAvatar(Request $request): JsonResponse |
|
185
|
191
|
{ |
|
186
|
|
- if (User::where('username', $request->json()->get('name'))->count() > 0 || !$this->filterName($request->json()->get('name'))) |
|
187
|
|
- return response()->json(['isAvailable' => false]); |
|
|
192
|
+ if (User::where('username', $request->json()->get('name'))->count() > 0 || !$this->filterName($request->json()->get('name'))) { |
|
|
193
|
+ return response()->json(['isAvailable' => false]); |
|
|
194
|
+ } |
|
188
|
195
|
|
|
189
|
196
|
$request->user()->name = $request->json()->get('name'); |
|
190
|
197
|
|
|
@@ -241,8 +248,9 @@ discard block |
|
|
block discarded – undo |
|
241
|
248
|
*/ |
|
242
|
249
|
public function confirmActivation(Request $request): JsonResponse |
|
243
|
250
|
{ |
|
244
|
|
- if (($mail = (new MailController)->getMail($request->json()->get('token'))) == null) |
|
245
|
|
- return response()->json(['error' => 'activation.invalid_token'], 400); |
|
|
251
|
+ if (($mail = (new MailController)->getMail($request->json()->get('token'))) == null) { |
|
|
252
|
+ return response()->json(['error' => 'activation.invalid_token'], 400); |
|
|
253
|
+ } |
|
246
|
254
|
|
|
247
|
255
|
if (strpos($mail->link, 'change-email') !== false): |
|
248
|
256
|
$mail = str_replace('change-email/', '', $mail->link); |
|
@@ -265,8 +273,9 @@ discard block |
|
|
block discarded – undo |
|
265
|
273
|
*/ |
|
266
|
274
|
public function forgotPassword(Request $request): JsonResponse |
|
267
|
275
|
{ |
|
268
|
|
- if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) |
|
269
|
|
- return response()->json(['email' => $request->json()->get('email')]); |
|
|
276
|
+ if (($user = User::where('mail', $request->json()->get('email'))->first()) == null) { |
|
|
277
|
+ return response()->json(['email' => $request->json()->get('email')]); |
|
|
278
|
+ } |
|
270
|
279
|
|
|
271
|
280
|
$mailController = new MailController; |
|
272
|
281
|
|