diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-04-29 12:37:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 12:37:03 +0200 |
| commit | a4fd92a6a06300c2a55a5dc1c39e8113f0385cdb (patch) | |
| tree | 79bbd1eb331c7ada743f3ae5a712b9f2dcfa8f35 | |
| parent | 7fd8e34aa16e4d9772eb94aed0a9c7e3348c78d8 (diff) | |
| parent | 8e560074a7557a8e815c94aca99e59bb28971577 (diff) | |
Merge pull request #12241 from nextcloud/backport/12198/stable29
[stable29] fix(signaling): Make alluserids more reliable for testing
| -rw-r--r-- | lib/Signaling/BackendNotifier.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Signaling/BackendNotifier.php b/lib/Signaling/BackendNotifier.php index 0b784f0f5..b735487a9 100644 --- a/lib/Signaling/BackendNotifier.php +++ b/lib/Signaling/BackendNotifier.php @@ -193,6 +193,8 @@ class BackendNotifier { * @throws \Exception */ public function roomsDisinvited(Room $room, array $attendees): void { + $allUserIds = $this->participantService->getParticipantUserIds($room); + sort($allUserIds); $userIds = []; foreach ($attendees as $attendee) { if ($attendee->getActorType() === Attendee::ACTOR_USERS) { @@ -206,7 +208,7 @@ class BackendNotifier { '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->getParticipantUserIds($room), + 'alluserids' => $allUserIds, 'properties' => $room->getPropertiesForSignaling('', false), ], ]); @@ -227,6 +229,8 @@ class BackendNotifier { * @throws \Exception */ public function roomSessionsRemoved(Room $room, array $sessionIds): void { + $allUserIds = $this->participantService->getParticipantUserIds($room); + sort($allUserIds); $start = microtime(true); $this->backendRequest($room, [ 'type' => 'disinvite', @@ -234,7 +238,7 @@ class BackendNotifier { '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' => $this->participantService->getParticipantUserIds($room), + 'alluserids' => $allUserIds, 'properties' => $room->getPropertiesForSignaling('', false), ], ]); |