Also load the session information when we load an attendee

Signed-off-by: Joas Schilling <[email protected]>

lib/Manager.php

@@ -291,14 +291,19 @@ public function getRoomsForUser(string $userId, bool $includeLastMessage = false
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->addSelect('a.*')
+			->addSelect('s.*')
 			->selectAlias('r.id', 'r_id')
 			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 				$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+				$query->expr()->eq('a.id', 's.attendee_id')
+			))
 			->where($query->expr()->isNotNull('a.id'));
 
 		if ($includeLastMessage) {
@@ -342,12 +347,17 @@ public function getRoomForUser(int $roomId, ?string $userId): Room {
 		if ($userId !== null) {
 			// Non guest user
 			$query->addSelect('a.*')
+				->addSelect('s.*')
 				->selectAlias('a.id', 'a_id')
+				->selectAlias('s.id', 's_id')
 				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
 				))
+				->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+					$query->expr()->eq('a.id', 's.attendee_id')
+				))
 				->andWhere($query->expr()->isNotNull('a.id'));
 		}
 
@@ -397,11 +407,16 @@ public function getRoomForUserByToken(string $token, ?string $userId, bool $incl
 		if ($userId !== null) {
 			// Non guest user
 			$query->addSelect('a.*')
-				->selectAlias('a.id', 'a_id');
-			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				->addSelect('s.*')
+				->selectAlias('a.id', 'a_id')
+				->selectAlias('s.id', 's_id')
+				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
+				))
+				->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+					$query->expr()->eq('a.id', 's.attendee_id')
 				));
 		}
 
@@ -477,14 +492,19 @@ public function getRoomByActor(string $token, string $actorType, string $actorId
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->addSelect('a.*')
+			->addSelect('s.*')
 			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
 			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 				$query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)),
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+				$query->expr()->eq('a.id', 's.attendee_id')
+			))
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
 
 		$result = $query->execute();