Skip to content

Commit 6a2be28

Browse files
Apply suggestions from code review
fix: coding style Co-authored-by: Andrew Lyons <[email protected]>
1 parent 6362141 commit 6a2be28

File tree

1 file changed

+13
-22
lines changed

1 file changed

+13
-22
lines changed

application/src/Controller/MatrixController.php

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ public function kick(
386386
}
387387

388388
/**
389-
* Create Matrix room.
389+
* Invite a user into an existing Matrix room.
390390
*
391391
* @param string $serverID The server ID.
392392
* @param string $roomID The Matrix rooms ID.
@@ -412,12 +412,10 @@ public function invite(
412412
$entityManager = $this->getDoctrine()->getManager();
413413

414414
// Check room exists.
415-
$room = $entityManager->getRepository(Room::class)->findOneBy(
416-
[
415+
$room = $entityManager->getRepository(Room::class)->findOneBy([
417416
'serverid' => $serverID,
418417
'roomid' => $roomID,
419-
]
420-
);
418+
]);
421419
if (!$room) {
422420
return $this->getUnknownRoomResponse();
423421
}
@@ -428,34 +426,27 @@ public function invite(
428426
return $check['message'];
429427
}
430428

431-
$user = $entityManager->getRepository(User::class)->findOneBy(
432-
[
429+
$user = $entityManager->getRepository(User::class)->findOneBy([
433430
'serverid' => $serverID,
434431
'userid' => $payload->user_id,
435-
]
436-
);
432+
]);
437433
if ($user) {
438434
// Cannot invite user that is already in the room.
439-
$membership = $entityManager->getRepository(RoomMember::class)->findOneBy(
440-
[
441-
'serverid' => $serverID,
442-
'room' => $room,
443-
'user' => $user,
444-
]
445-
);
435+
$membership = $entityManager->getRepository(RoomMember::class)->findOneBy([
436+
'serverid' => $serverID,
437+
'room' => $room,
438+
'user' => $user,
439+
]);
446440

447441
if (!empty($membership)) {
448-
return new JsonResponse(
449-
(object) [
442+
return new JsonResponse((object) [
450443
'errcode' => 'M_NOT_MEMBER',
451444
'error' => 'The invitee is already a member of the room.'
452-
],
453-
403
454-
);
445+
], 403);
455446
}
456447
}
457448

458-
return new JsonResponse((object)[]);
449+
return new JsonResponse((object)[], 200);
459450
}
460451

461452
/**

0 commit comments

Comments
 (0)