fix: Remove unused "activeGuests" attribute

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

lib/Activity/Listener.php

@@ -75,8 +75,7 @@ class Listener implements IEventListener {
 		$this->roomService->setActiveSince(
 			$event->getRoom(),
 			$this->timeFactory->getDateTime(),
-			$participant->getSession() ? $participant->getSession()->getInCall() : Participant::FLAG_DISCONNECTED,
-			$participant->getAttendee()->getActorType() !== Attendee::ACTOR_USERS
+			$participant->getSession() ? $participant->getSession()->getInCall() : Participant::FLAG_DISCONNECTED
 		);
 	}
 

lib/Manager.php

@@ -104,7 +104,6 @@ class Manager {
 			'avatar' => '',
 			'remote_server' => '',
 			'remote_token' => '',
-			'active_guests' => 0,
 			'default_permissions' => 0,
 			'call_permissions' => 0,
 			'call_flag' => 0,
@@ -174,7 +173,6 @@ class Manager {
 			(string) $row['avatar'],
 			(string) $row['remote_server'],
 			(string) $row['remote_token'],
-			(int) $row['active_guests'],
 			(int) $row['default_permissions'],
 			(int) $row['call_permissions'],
 			(int) $row['call_flag'],

lib/Model/SelectHelper.php

@@ -26,7 +26,6 @@ class SelectHelper {
 			->addSelect($alias . 'description')
 			->addSelect($alias . 'password')
 			->addSelect($alias . 'avatar')
-			->addSelect($alias . 'active_guests')
 			->addSelect($alias . 'active_since')
 			->addSelect($alias . 'default_permissions')
 			->addSelect($alias . 'call_permissions')

lib/Room.php

@@ -111,7 +111,6 @@ class Room {
 		private string $avatar,
 		private string $remoteServer,
 		private string $remoteToken,
-		private int $activeGuests,
 		private int $defaultPermissions,
 		private int $callPermissions,
 		private int $callFlag,
@@ -296,7 +295,6 @@ class Room {
 	}
 
 	public function resetActiveSince(): void {
-		$this->activeGuests = 0;
 		$this->activeSince = null;
 	}
 
@@ -500,14 +498,11 @@ class Room {
 		return $this->manager->createParticipantObject($this, $row);
 	}
 
-	public function setActiveSince(\DateTime $since, int $callFlag, bool $isGuest): void {
+	public function setActiveSince(\DateTime $since, int $callFlag): void {
 		if (!$this->activeSince) {
 			$this->activeSince = $since;
 		}
 		$this->callFlag |= $callFlag;
-		if ($isGuest) {
-			$this->activeGuests++;
-		}
 	}
 
 	public function getBreakoutRoomMode(): int {

lib/Service/RoomService.php

@@ -834,7 +834,6 @@ class RoomService {
 	public function resetActiveSince(Room $room): bool {
 		$update = $this->db->getQueryBuilder();
 		$update->update('talk_rooms')
-			->set('active_guests', $update->createNamedParameter(0, IQueryBuilder::PARAM_INT))
 			->set('active_since', $update->createNamedParameter(null, IQueryBuilder::PARAM_DATE))
 			->set('call_flag', $update->createNamedParameter(0, IQueryBuilder::PARAM_INT))
 			->set('call_permissions', $update->createNamedParameter(Attendee::PERMISSIONS_DEFAULT, IQueryBuilder::PARAM_INT))
@@ -846,30 +845,18 @@ class RoomService {
 		return (bool) $update->executeStatement();
 	}
 
-	public function setActiveSince(Room $room, \DateTime $since, int $callFlag, bool $isGuest): bool {
-		if ($isGuest && $room->getType() === Room::TYPE_PUBLIC) {
-			$update = $this->db->getQueryBuilder();
-			$update->update('talk_rooms')
-				->set('active_guests', $update->createFunction($update->getColumnName('active_guests') . ' + 1'))
-				->set(
-					'call_flag',
-					$update->expr()->bitwiseOr('call_flag', $callFlag)
-				)
-				->where($update->expr()->eq('id', $update->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)));
-			$update->executeStatement();
-		} elseif (!$isGuest) {
-			$update = $this->db->getQueryBuilder();
-			$update->update('talk_rooms')
-				->set(
-					'call_flag',
-					$update->expr()->bitwiseOr('call_flag', $callFlag)
-				)
-				->where($update->expr()->eq('id', $update->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)));
-			$update->executeStatement();
-		}
+	public function setActiveSince(Room $room, \DateTime $since, int $callFlag): bool {
+		$update = $this->db->getQueryBuilder();
+		$update->update('talk_rooms')
+			->set(
+				'call_flag',
+				$update->expr()->bitwiseOr('call_flag', $callFlag)
+			)
+			->where($update->expr()->eq('id', $update->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)));
+		$update->executeStatement();
 
 		if ($room->getActiveSince() instanceof \DateTime) {
-			$room->setActiveSince($room->getActiveSince(), $callFlag, $isGuest);
+			$room->setActiveSince($room->getActiveSince(), $callFlag);
 			return false;
 		}
 
@@ -880,7 +867,7 @@ class RoomService {
 			->andWhere($update->expr()->isNull('active_since'));
 		$update->executeStatement();
 
-		$room->setActiveSince($since, $callFlag, $isGuest);
+		$room->setActiveSince($since, $callFlag);
 
 		return true;
 	}

tests/php/Service/RoomServiceTest.php

@@ -350,7 +350,6 @@ class RoomServiceTest extends TestCase {
 			'',
 			'',
 			'',
-			0,
 			Attendee::PERMISSIONS_DEFAULT,
 			Attendee::PERMISSIONS_DEFAULT,
 			Participant::FLAG_DISCONNECTED,