Get participants from the room

Signed-off-by: Joas Schilling <coding@schilljs.com>

lib/Controller/ApiController.php

@@ -93,30 +93,29 @@ class ApiController extends Controller {
 	/**
 	 * @param int $roomId
 	 * @return array
+	 * @deprecated
 	 */
 	private function getActivePeers($roomId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		return $qb->select('*')
-			->from('spreedme_room_participants')
-			->where($qb->expr()->eq('roomId', $qb->createNamedParameter($roomId)))
-			->andWhere($qb->expr()->gt('lastPing', $qb->createNamedParameter(time() - 10)))
-			->execute()
-			->fetchAll();
+		try {
+			$room = $this->manager->getRoomById($roomId);
+		} catch (RoomNotFoundException $e) {
+			return [];
+		}
+		return $room->getParticipants(time() - 10);
 	}
 
 	/**
-	 * Get all participants for a room
-	 *
 	 * @param int $roomId
 	 * @return array
+	 * @deprecated
 	 */
 	private function getRoomParticipants($roomId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		return $qb->select('*')
-			->from('spreedme_room_participants')
-			->where($qb->expr()->eq('roomId', $qb->createNamedParameter($roomId)))
-			->execute()
-			->fetchAll();
+		try {
+			$room = $this->manager->getRoomById($roomId);
+		} catch (RoomNotFoundException $e) {
+			return [];
+		}
+		return $room->getParticipants();
 	}
 
 	/**
@@ -230,7 +229,12 @@ class ApiController extends Controller {
 	 * @return JSONResponse
 	 */
 	public function getPeersInRoom($roomId) {
-		return new JSONResponse($this->getActivePeers($roomId));
+		try {
+			$room = $this->manager->getRoomById($roomId);
+		} catch (RoomNotFoundException $e) {
+			return new JSONResponse([], Http::STATUS_NOT_FOUND);
+		}
+		return new JSONResponse($room->getParticipants());
 	}
 
 	/**

lib/Manager.php

@@ -78,7 +78,7 @@ class Manager {
 			->values(
 				[
 					'name' => $query->createNamedParameter($name),
-					'type' => $query->createNamedParameter($type),
+					'type' => $query->createNamedParameter($type, IQueryBuilder::PARAM_INT),
 				]
 			);
 		$query->execute();

lib/Room.php

@@ -22,6 +22,7 @@
 
 namespace OCA\Spreed;
 
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
 
@@ -85,9 +86,30 @@ class Room {
 				[
 					'userId' => $query->createNamedParameter($user),
 					'roomId' => $query->createNamedParameter($this->getId()),
-					'lastPing' => $query->createNamedParameter('0'),
+					'lastPing' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
 				]
 			);
 		$query->execute();
 	}
+
+	/**
+	 * @param int $lastPing When the last ping is older than the given timestamp, the user is ignored
+	 * @return array[] Array of users with [userId, roomId, lastPing]
+	 */
+	public function getParticipants($lastPing = 0) {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->from('spreedme_room_participants')
+			->where($query->expr()->eq('roomId', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+
+		if ($lastPing > 0) {
+			$query->andWhere($query->expr()->gt('lastPing', $query->createNamedParameter($lastPing, IQueryBuilder::PARAM_INT)));
+		}
+
+		$result = $query->execute();
+		$rows = $result->fetchAll();
+		$result->closeCursor();
+
+		return $rows;
+	}
 }