diff options
author | Joas Schilling <coding@schilljs.com> | 2020-10-19 18:12:46 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-10-30 12:38:09 +0300 |
commit | ccfd918a57212682fd83751d4bca0e67e463a043 (patch) | |
tree | 531fa3cbbbe114973317ef2e677cf48d6afe69b5 /lib/Manager.php | |
parent | f2d5dac8c906644083056b8936f1eb72560b53b3 (diff) |
Fix loading a Room by session
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Manager.php')
-rw-r--r-- | lib/Manager.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/Manager.php b/lib/Manager.php index e5821ed69..6ad66c2ad 100644 --- a/lib/Manager.php +++ b/lib/Manager.php @@ -553,20 +553,25 @@ class Manager { $query = $this->db->getQueryBuilder(); $query->select('*') - ->from('talk_participants', 'p') - ->leftJoin('p', 'talk_rooms', 'r', $query->expr()->eq('p.room_id', 'r.id')) - ->where($query->expr()->eq('p.session_id', $query->createNamedParameter($sessionId))) + ->selectAlias('r.id', 'r_id') + ->selectAlias('a.id', 'a_id') + ->selectAlias('s.id', 's_id') + ->from('talk_sessions', 's') + ->leftJoin('s', 'talk_attendees', 'a', $query->expr()->eq('a.id', 's.attendee_id')) + ->leftJoin('a', 'talk_rooms', 'r', $query->expr()->eq('a.room_id', 'r.id')) + ->where($query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId))) ->setMaxResults(1); $result = $query->execute(); $row = $result->fetch(); $result->closeCursor(); - if ($row === false || !$row['id']) { + if ($row === false || !$row['r_id']) { throw new RoomNotFoundException(); } - if ((string) $userId !== $row['user_id']) { + if ((string) $userId !== $row['actor_id']) { + // FIXME check the actor type too and bail out for guests throw new RoomNotFoundException(); } @@ -577,9 +582,9 @@ class Manager { $room = $this->createRoomObject($row); $participant = $this->createParticipantObject($room, $row); - $room->setParticipant($row['user_id'], $participant); + $room->setParticipant($row['actor_id'], $participant); - if ($room->getType() === Room::PUBLIC_CALL || !in_array($participant->getParticipantType(), [Participant::GUEST, Participant::USER_SELF_JOINED], true)) { + if ($room->getType() === Room::PUBLIC_CALL || !in_array($participant->getAttendee()->getParticipantType(), [Participant::GUEST, Participant::GUEST_MODERATOR, Participant::USER_SELF_JOINED], true)) { return $room; } |