feat(signaling): Don't send all room userids in signaling server requests

Signed-off-by: Joachim Bauch <bauch@struktur.de>

Author: fancycode

lib/Signaling/BackendNotifier.php

@@ -152,14 +152,14 @@ public function roomInvited(Room $room, array $attendees): void {
 				$userIds[] = $attendee->getActorId();
 			}
 		}
+		if (empty($userIds)) {
+			return;
+		}
 		$start = microtime(true);
 		$this->backendRequest($room, [
 			'type' => 'invite',
 			'invite' => [
 				'userids' => $userIds,
-				// TODO(fancycode): We should try to get rid of 'alluserids' and
-				// find a better way to notify existing users to update the room.
-				'alluserids' => $this->participantService->getParticipantUserIdsAndFederatedUserCloudIds($room),
 				'properties' => $room->getPropertiesForSignaling('', false),
 			],
 		]);
@@ -180,22 +180,20 @@ public function roomInvited(Room $room, array $attendees): void {
 	 * @throws \Exception
 	 */
 	public function roomsDisinvited(Room $room, array $attendees): void {
-		$allUserIds = $this->participantService->getParticipantUserIdsAndFederatedUserCloudIds($room);
-		sort($allUserIds);
 		$userIds = [];
 		foreach ($attendees as $attendee) {
 			if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 				$userIds[] = $attendee->getActorId();
 			}
 		}
+		if (empty($userIds)) {
+			return;
+		}
 		$start = microtime(true);
 		$this->backendRequest($room, [
 			'type' => 'disinvite',
 			'disinvite' => [
 				'userids' => $userIds,
-				// TODO(fancycode): We should try to get rid of 'alluserids' and
-				// find a better way to notify existing users to update the room.
-				'alluserids' => $allUserIds,
 				'properties' => $room->getPropertiesForSignaling('', false),
 			],
 		]);
@@ -216,16 +214,11 @@ public function roomsDisinvited(Room $room, array $attendees): void {
 	 * @throws \Exception
 	 */
 	public function roomSessionsRemoved(Room $room, array $sessionIds): void {
-		$allUserIds = $this->participantService->getParticipantUserIdsAndFederatedUserCloudIds($room);
-		sort($allUserIds);
 		$start = microtime(true);
 		$this->backendRequest($room, [
 			'type' => 'disinvite',
 			'disinvite' => [
 				'sessionids' => $sessionIds,
-				// TODO(fancycode): We should try to get rid of 'alluserids' and
-				// find a better way to notify existing users to update the room.
-				'alluserids' => $allUserIds,
 				'properties' => $room->getPropertiesForSignaling('', false),
 			],
 		]);
@@ -249,10 +242,6 @@ public function roomModified(Room $room): void {
 		$this->backendRequest($room, [
 			'type' => 'update',
 			'update' => [
-				// Message not sent for federated users, as they will receive
-				// the message from their federated Nextcloud server once the
-				// property change is propagated.
-				'userids' => $this->participantService->getParticipantUserIds($room),
 				'properties' => $room->getPropertiesForSignaling(''),
 			],
 		]);
@@ -271,13 +260,11 @@ public function roomModified(Room $room): void {
 	 * @param string[] $userIds
 	 * @throws \Exception
 	 */
-	public function roomDeleted(Room $room, array $userIds): void {
+	public function roomDeleted(Room $room): void {
 		$start = microtime(true);
 		$this->backendRequest($room, [
 			'type' => 'delete',
-			'delete' => [
-				'userids' => $userIds,
-			],
+			'delete' => (object)[],
 		]);
 		$duration = microtime(true) - $start;
 		$this->logger->debug('Room deleted: {token} ({duration})', [
@@ -323,7 +310,6 @@ public function switchToRoom(Room $room, string $switchToRoomToken, array $sessi
 	 */
 	public function participantsModified(Room $room, array $sessionIds): void {
 		$changed = [];
-		$users = [];
 		$participants = $this->participantService->getSessionsAndParticipantsForRoom($room);
 		foreach ($participants as $participant) {
 			$attendee = $participant->getAttendee();
@@ -354,7 +340,6 @@ public function participantsModified(Room $room, array $sessionIds): void {
 				$data['lastPing'] = $session->getLastPing();
 				$data['sessionId'] = $session->getSessionId();
 				$data['participantPermissions'] = $participant->getPermissions();
-				$users[] = $data;
 
 				if (\in_array($session->getSessionId(), $sessionIds, true)) {
 					$data['permissions'] = [];
@@ -372,17 +357,17 @@ public function participantsModified(Room $room, array $sessionIds): void {
 					}
 					$changed[] = $data;
 				}
-			} else {
-				$users[] = $data;
 			}
 		}
 
+		if (empty($changed)) {
+			return;
+		}
 		$start = microtime(true);
 		$this->backendRequest($room, [
 			'type' => 'participants',
 			'participants' => [
 				'changed' => $changed,
-				'users' => $users
 			],
 		]);
 		$duration = microtime(true) - $start;
@@ -411,7 +396,6 @@ public function roomInCallChanged(Room $room, int $flags, array $sessionIds, boo
 			];
 		} else {
 			$changed = [];
-			$users = [];
 
 			$participants = $this->participantService->getParticipantsForAllSessions($room);
 			foreach ($participants as $participant) {
@@ -442,19 +426,17 @@ public function roomInCallChanged(Room $room, int $flags, array $sessionIds, boo
 					$data['userId'] = $attendee->getActorId();
 				}
 
-				if ($session->getInCall() !== Participant::FLAG_DISCONNECTED) {
-					$users[] = $data;
-				}
-
 				if (\in_array($session->getSessionId(), $sessionIds, true)) {
 					$changed[] = $data;
 				}
 			}
 
+			if (empty($changed)) {
+				return;
+			}
 			$data = [
 				'incall' => $flags,
 				'changed' => $changed,
-				'users' => $users,
 			];
 		}
 

lib/Signaling/Listener.php

@@ -263,7 +263,7 @@ protected function notifyCallEndedForEveryone(CallEndedForEveryoneEvent $event):
 
 	protected function notifyBeforeRoomDeleted(BeforeRoomDeletedEvent $event): void {
 		$room = $event->getRoom();
-		$this->externalSignaling->roomDeleted($room, $this->participantService->getParticipantUserIds($room));
+		$this->externalSignaling->roomDeleted($room);
 	}
 
 	protected function notifyGuestsCleanedUp(GuestsCleanedUpEvent $event): void {