fix(events): Migrate signaling to typed events

lib/AppInfo/Application.php

@@ -54,20 +54,24 @@
 use OCA\Talk\Events\AttendeeRemovedEvent;
 use OCA\Talk\Events\AttendeesAddedEvent;
 use OCA\Talk\Events\AttendeesRemovedEvent;
+use OCA\Talk\Events\BeforeAttendeeRemovedEvent;
 use OCA\Talk\Events\BeforeAttendeesAddedEvent;
 use OCA\Talk\Events\BeforeCallEndedForEveryoneEvent;
 use OCA\Talk\Events\BeforeChatMessageSentEvent;
 use OCA\Talk\Events\BeforeDuplicateShareSentEvent;
 use OCA\Talk\Events\BeforeGuestJoinedRoomEvent;
 use OCA\Talk\Events\BeforeParticipantModifiedEvent;
+use OCA\Talk\Events\BeforeRoomDeletedEvent;
 use OCA\Talk\Events\BeforeRoomsFetchEvent;
+use OCA\Talk\Events\BeforeSessionLeftRoomEvent;
 use OCA\Talk\Events\BeforeUserJoinedRoomEvent;
 use OCA\Talk\Events\BotInstallEvent;
 use OCA\Talk\Events\BotUninstallEvent;
 use OCA\Talk\Events\CallEndedForEveryoneEvent;
 use OCA\Talk\Events\CallNotificationSendEvent;
 use OCA\Talk\Events\ChatMessageSentEvent;
 use OCA\Talk\Events\EmailInvitationSentEvent;
+use OCA\Talk\Events\GuestJoinedRoomEvent;
 use OCA\Talk\Events\GuestsCleanedUpEvent;
 use OCA\Talk\Events\LobbyModifiedEvent;
 use OCA\Talk\Events\MessageParseEvent;
@@ -77,6 +81,7 @@
 use OCA\Talk\Events\RoomModifiedEvent;
 use OCA\Talk\Events\SessionLeftRoomEvent;
 use OCA\Talk\Events\SystemMessageSentEvent;
+use OCA\Talk\Events\SystemMessagesMultipleSentEvent;
 use OCA\Talk\Events\UserJoinedRoomEvent;
 use OCA\Talk\Federation\CloudFederationProviderTalk;
 use OCA\Talk\Federation\Listener as FederationListener;
@@ -271,9 +276,31 @@ public function register(IRegistrationContext $context): void {
 		// Federation listeners
 		$context->registerEventListener(RoomModifiedEvent::class, FederationListener::class);
 
-		// Signaling listeners
+		// Signaling listeners (External)
+		$context->registerEventListener(AttendeesAddedEvent::class, SignalingListener::class);
+		$context->registerEventListener(AttendeeRemovedEvent::class, SignalingListener::class);
+		$context->registerEventListener(AttendeesRemovedEvent::class, SignalingListener::class);
+		$context->registerEventListener(SessionLeftRoomEvent::class, SignalingListener::class);
+
+		$context->registerEventListener(CallEndedForEveryoneEvent::class, SignalingListener::class);
+		$context->registerEventListener(GuestsCleanedUpEvent::class, SignalingListener::class);
+		$context->registerEventListener(LobbyModifiedEvent::class, SignalingListener::class);
+
+		$context->registerEventListener(ChatMessageSentEvent::class, SignalingListener::class);
+		$context->registerEventListener(SystemMessageSentEvent::class, SignalingListener::class);
+		$context->registerEventListener(SystemMessagesMultipleSentEvent::class, SignalingListener::class);
+
+		// Signaling listeners (Both)
+		$context->registerEventListener(BeforeRoomDeletedEvent::class, SignalingListener::class);
+		$context->registerEventListener(ParticipantModifiedEvent::class, SignalingListener::class);
 		$context->registerEventListener(RoomModifiedEvent::class, SignalingListener::class);
 
+		// Signaling listeners (Internal)
+		$context->registerEventListener(BeforeSessionLeftRoomEvent::class, SignalingListener::class);
+		$context->registerEventListener(BeforeAttendeeRemovedEvent::class, SignalingListener::class);
+		$context->registerEventListener(GuestJoinedRoomEvent::class, SignalingListener::class);
+		$context->registerEventListener(UserJoinedRoomEvent::class, SignalingListener::class);
+
 		// Video verification
 		$context->registerEventListener(BeforeUserJoinedRoomEvent::class, PublicShareAuthListener::class);
 		$context->registerEventListener(BeforeGuestJoinedRoomEvent::class, PublicShareAuthListener::class);
@@ -299,17 +326,10 @@ public function register(IRegistrationContext $context): void {
 	}
 
 	public function boot(IBootContext $context): void {
-		$server = $context->getServerContainer();
-
 		$context->injectFn([$this, 'registerCollaborationResourceProvider']);
 		$context->injectFn([$this, 'registerClientLinks']);
 		$context->injectFn([$this, 'registerNavigationLink']);
 		$context->injectFn([$this, 'registerCloudFederationProviderManager']);
-
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $server->get(IEventDispatcher::class);
-
-		SignalingListener::register($dispatcher);
 	}
 
 	public function registerCollaborationResourceProvider(IProviderManager $resourceManager, IEventDispatcher $dispatcher): void {

lib/Service/RoomService.php

@@ -860,6 +860,7 @@ public function setBreakoutRoomStatus(Room $room, int $status): bool {
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_SET_BREAKOUT_ROOM_STATUS, $event);
 		$oldStatus = $room->getBreakoutRoomStatus();
 		$event = new RoomModifiedEvent($room, ARoomModifiedEvent::PROPERTY_BREAKOUT_ROOM_STATUS, $status, $oldStatus);
+		$this->dispatcher->dispatchTyped($event);
 
 		return true;
 	}

lib/Signaling/BackendNotifier.php

@@ -155,14 +155,14 @@ private function backendRequest(Room $room, array $data): ?IResponse {
 	 * The given users are now invited to a room.
 	 *
 	 * @param Room $room
-	 * @param array[] $users
+	 * @param Attendee[] $attendees
 	 * @throws \Exception
 	 */
-	public function roomInvited(Room $room, array $users): void {
+	public function roomInvited(Room $room, array $attendees): void {
 		$userIds = [];
-		foreach ($users as $user) {
-			if ($user['actorType'] === Attendee::ACTOR_USERS) {
-				$userIds[] = $user['actorId'];
+		foreach ($attendees as $attendee) {
+			if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
+				$userIds[] = $attendee->getActorId();
 			}
 		}
 		$start = microtime(true);
@@ -179,7 +179,7 @@ public function roomInvited(Room $room, array $users): void {
 		$duration = microtime(true) - $start;
 		$this->logger->debug('Now invited to {token}: {users} ({duration})', [
 			'token' => $room->getToken(),
-			'users' => print_r($users, true),
+			'users' => print_r($userIds, true),
 			'duration' => sprintf('%.2f', $duration),
 			'app' => 'spreed-hpb',
 		]);
@@ -189,10 +189,16 @@ public function roomInvited(Room $room, array $users): void {
 	 * The given users are no longer invited to a room.
 	 *
 	 * @param Room $room
-	 * @param string[] $userIds
+	 * @param Attendee[] $attendees
 	 * @throws \Exception
 	 */
-	public function roomsDisinvited(Room $room, array $userIds): void {
+	public function roomsDisinvited(Room $room, array $attendees): void {
+		$userIds = [];
+		foreach ($attendees as $attendee) {
+			if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
+				$userIds[] = $attendee->getActorId();
+			}
+		}
 		$start = microtime(true);
 		$this->backendRequest($room, [
 			'type' => 'disinvite',