Handle all user status changes in case of "End meeting for all" in 1 …

lib/Events/EndCallForEveryoneEvent.php

@@ -30,6 +30,8 @@ class EndCallForEveryoneEvent extends ModifyRoomEvent {
 
 	/** @var string[] */
 	protected $sessionIds;
+	/** @var string[] */
+	protected $userIds;
 
 	public function __construct(Room $room,
 								?Participant $actor = null) {
@@ -51,4 +53,20 @@ public function setSessionIds(array $sessionIds): void {
 	public function getSessionIds(): array {
 		return $this->sessionIds;
 	}
+
+	/**
+	 * @param string[] $userIds
+	 * @return void
+	 */
+	public function setUserIds(array $userIds): void {
+		$this->userIds = $userIds;
+	}
+
+	/**
+	 * Only available in the after-event
+	 * @return string[]
+	 */
+	public function getUserIds(): array {
+		return $this->userIds;
+	}
 }

lib/Service/ParticipantService.php

@@ -913,14 +913,19 @@ public function endCallForEveryone(Room $room, Participant $moderator): void {
 
 		$participants = $this->getParticipantsInCall($room);
 		$changedSessionIds = [];
+		$changedUserIds = [];
 
 		// kick out all participants out of the call
 		foreach ($participants as $participant) {
 			$changedSessionIds[] = $participant->getSession()->getSessionId();
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
+				$changedUserIds[] = $participant->getAttendee()->getActorId();
+			}
 			$this->changeInCall($room, $participant, Participant::FLAG_DISCONNECTED, true);
 		}
 
 		$event->setSessionIds($changedSessionIds);
+		$event->setUserIds($changedUserIds);
 
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_END_CALL_FOR_EVERYONE, $event);
 	}

lib/Status/Listener.php

@@ -26,6 +26,8 @@
 
 namespace OCA\Talk\Status;
 
+use OCA\Talk\Events\EndCallForEveryoneEvent;
+use OCA\Talk\Events\ModifyEveryoneEvent;
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
@@ -53,6 +55,12 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$listener = \OC::$server->get(self::class);
 			$listener->revertUserStatus($event);
 		});
+
+		$dispatcher->addListener(Room::EVENT_AFTER_END_CALL_FOR_EVERYONE, static function (EndCallForEveryoneEvent $event) {
+			/** @var self $listener */
+			$listener = \OC::$server->get(self::class);
+			$listener->revertUserStatusOnEndCallForEveryone($event);
+		});
 	}
 
 	public function setUserStatus(ModifyParticipantEvent $event): void {
@@ -62,8 +70,21 @@ public function setUserStatus(ModifyParticipantEvent $event): void {
 	}
 
 	public function revertUserStatus(ModifyParticipantEvent $event): void {
+		if ($event instanceof ModifyEveryoneEvent) {
+			// Do not revert the status with 3 queries per user.
+			// We will update it in one go at the end.
+			return;
+		}
+
 		if ($event->getParticipant()->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 			$this->statusManager->revertUserStatus($event->getParticipant()->getAttendee()->getActorId(), 'call', IUserStatus::AWAY);
 		}
 	}
+
+	public function revertUserStatusOnEndCallForEveryone(EndCallForEveryoneEvent $event): void {
+		$userIds = $event->getUserIds();
+		if (!empty($userIds)) {
+			$this->statusManager->revertMultipleUserStatus($userIds, 'call', IUserStatus::AWAY);
+		}
+	}
 }