Replace deprecated method

deprecated 20.0.0 use \Psr\Container\ContainerInterface::get

Signed-off-by: Vitor Mattos <vitor@php.rio>

13 files changed, 73 insertions, 73 deletions

diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php
index b4166c4b3..467295e7c 100644
--- a/lib/Activity/Listener.php
+++ b/lib/Activity/Listener.php
@@ -76,21 +76,21 @@ class Listener {
 	public static function register(IEventDispatcher $dispatcher): void {
 		$listener = static function (ModifyParticipantEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->setActive($event->getRoom(), $event->getParticipant());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_JOIN_CALL, $listener);
 
 		$listener = static function (ModifyRoomEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->generateCallActivity($event->getRoom(), true, $event->getActor());
 		};
 		$dispatcher->addListener(Room::EVENT_BEFORE_END_CALL_FOR_EVERYONE, $listener);
 
 		$listener = static function (RoomEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->generateCallActivity($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_PARTICIPANT_REMOVE, $listener);
@@ -100,7 +100,7 @@ class Listener {
 
 		$listener = static function (AddParticipantsEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->generateInvitationActivity($event->getRoom(), $event->getParticipants());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_USERS_ADD, $listener);
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index a85d6f7d7..f382e6652 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -150,7 +150,7 @@ class Application extends App implements IBootstrap {
 		$this->registerNavigationLink($server);
 
 		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $server->query(IEventDispatcher::class);
+		$dispatcher = $server->get(IEventDispatcher::class);
 
 		ActivityListener::register($dispatcher);
 		NotificationListener::register($dispatcher);
@@ -181,7 +181,7 @@ class Application extends App implements IBootstrap {
 
 	protected function registerCollaborationResourceProvider(IServerContainer $server): void {
 		/** @var IProviderManager $resourceManager */
-		$resourceManager = $server->query(IProviderManager::class);
+		$resourceManager = $server->get(IProviderManager::class);
 		$resourceManager->registerResourceProvider(ConversationProvider::class);
 		$server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
 			\OCP\Util::addScript(self::APP_ID, 'talk-collections');
@@ -199,7 +199,7 @@ class Application extends App implements IBootstrap {
 	protected function registerNavigationLink(IServerContainer $server): void {
 		$server->getNavigationManager()->add(function () use ($server) {
 			/** @var Config $config */
-			$config = $server->query(Config::class);
+			$config = $server->get(Config::class);
 			$user = $server->getUserSession()->getUser();
 			return [
 				'id' => self::APP_ID,
diff --git a/lib/Chat/Changelog/Listener.php b/lib/Chat/Changelog/Listener.php
index c89e9fda0..7ff92f9d7 100644
--- a/lib/Chat/Changelog/Listener.php
+++ b/lib/Chat/Changelog/Listener.php
@@ -33,7 +33,7 @@ class Listener {
 			$userId = $event->getUserId();
 
 			/** @var Listener $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->preGetRooms($userId);
 		}, -100);
 	}
diff --git a/lib/Chat/Command/Listener.php b/lib/Chat/Command/Listener.php
index 27582aa2d..4cdb0c8e0 100644
--- a/lib/Chat/Command/Listener.php
+++ b/lib/Chat/Command/Listener.php
@@ -49,7 +49,7 @@ class Listener {
 			$participant = $event->getParticipant();
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			if (strpos($message->getMessage(), '//') === 0) {
 				return;
diff --git a/lib/Chat/Parser/Listener.php b/lib/Chat/Parser/Listener.php
index 75e068b7c..83e26f673 100644
--- a/lib/Chat/Parser/Listener.php
+++ b/lib/Chat/Parser/Listener.php
@@ -38,7 +38,7 @@ class Listener {
 			}
 
 			/** @var UserMention $parser */
-			$parser = \OC::$server->query(UserMention::class);
+			$parser = \OC::$server->get(UserMention::class);
 			$parser->parseMessage($message);
 		}, -100);
 
@@ -50,7 +50,7 @@ class Listener {
 			}
 
 			/** @var Changelog $parser */
-			$parser = \OC::$server->query(Changelog::class);
+			$parser = \OC::$server->get(Changelog::class);
 			try {
 				$parser->parseMessage($message);
 				$event->stopPropagation();
@@ -67,7 +67,7 @@ class Listener {
 			}
 
 			/** @var SystemMessage $parser */
-			$parser = \OC::$server->query(SystemMessage::class);
+			$parser = \OC::$server->get(SystemMessage::class);
 
 			try {
 				$parser->parseMessage($message);
@@ -85,7 +85,7 @@ class Listener {
 			}
 
 			/** @var CommandParser $parser */
-			$parser = \OC::$server->query(CommandParser::class);
+			$parser = \OC::$server->get(CommandParser::class);
 
 			try {
 				$parser->parseMessage($chatMessage);
@@ -105,7 +105,7 @@ class Listener {
 			}
 
 			/** @var SystemMessage $parser */
-			$parser = \OC::$server->query(SystemMessage::class);
+			$parser = \OC::$server->get(SystemMessage::class);
 
 			try {
 				$parser->parseDeletedMessage($chatMessage);
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index 170a03939..0ecbd4636 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -86,9 +86,9 @@ class Listener implements IEventListener {
 		$dispatcher->addListener(Room::EVENT_BEFORE_SESSION_JOIN_CALL, static function (ModifyParticipantEvent $event) {
 			$room = $event->getRoom();
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			/** @var ParticipantService $participantService */
-			$participantService = \OC::$server->query(ParticipantService::class);
+			$participantService = \OC::$server->get(ParticipantService::class);
 
 			if ($participantService->hasActiveSessionsInCall($room)) {
 				$listener->sendSystemMessage($room, 'call_joined', [], $event->getParticipant());
@@ -115,7 +115,7 @@ class Listener implements IEventListener {
 			}
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			$listener->sendSystemMessage($room, 'call_left', [], $event->getParticipant());
 		});
@@ -123,7 +123,7 @@ class Listener implements IEventListener {
 		$dispatcher->addListener(Room::EVENT_AFTER_ROOM_CREATE, static function (RoomEvent $event) {
 			$room = $event->getRoom();
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			$listener->sendSystemMessage($room, 'conversation_created');
 		});
@@ -135,7 +135,7 @@ class Listener implements IEventListener {
 
 			$room = $event->getRoom();
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			$listener->sendSystemMessage($room, 'conversation_renamed', [
 				'newName' => $event->getNewValue(),
@@ -158,7 +158,7 @@ class Listener implements IEventListener {
 		$dispatcher->addListener(Room::EVENT_AFTER_PASSWORD_SET, static function (ModifyRoomEvent $event) {
 			$room = $event->getRoom();
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			if ($event->getNewValue() !== '') {
 				$listener->sendSystemMessage($room, 'password_set');
@@ -175,11 +175,11 @@ class Listener implements IEventListener {
 
 			if ($event->getNewValue() === Room::TYPE_PUBLIC) {
 				/** @var self $listener */
-				$listener = \OC::$server->query(self::class);
+				$listener = \OC::$server->get(self::class);
 				$listener->sendSystemMessage($room, 'guests_allowed');
 			} elseif ($event->getNewValue() === Room::TYPE_GROUP) {
 				/** @var self $listener */
-				$listener = \OC::$server->query(self::class);
+				$listener = \OC::$server->get(self::class);
 				$listener->sendSystemMessage($room, 'guests_disallowed');
 			}
 		});
@@ -191,7 +191,7 @@ class Listener implements IEventListener {
 			}
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			if ($event->getNewValue() === Room::READ_ONLY) {
 				$listener->sendSystemMessage($room, 'read_only');
@@ -203,7 +203,7 @@ class Listener implements IEventListener {
 			$room = $event->getRoom();
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			if ($event->getNewValue() === Room::LISTABLE_NONE) {
 				$listener->sendSystemMessage($room, 'listable_none');
@@ -221,7 +221,7 @@ class Listener implements IEventListener {
 			$room = $event->getRoom();
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			if ($event->isTimerReached()) {
 				$listener->sendSystemMessage($room, 'lobby_timer_reached');
@@ -239,7 +239,7 @@ class Listener implements IEventListener {
 			}
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			$participants = $event->getParticipants();
 
@@ -281,7 +281,7 @@ class Listener implements IEventListener {
 			}
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->sendSystemMessage($room, 'user_removed', ['user' => $event->getUser()->getUID()]);
 		});
 		$dispatcher->addListener(Room::EVENT_AFTER_PARTICIPANT_TYPE_SET, static function (ModifyParticipantEvent $event) {
@@ -294,25 +294,25 @@ class Listener implements IEventListener {
 
 			if ($event->getNewValue() === Participant::MODERATOR) {
 				/** @var self $listener */
-				$listener = \OC::$server->query(self::class);
+				$listener = \OC::$server->get(self::class);
 				$listener->sendSystemMessage($room, 'moderator_promoted', ['user' => $attendee->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::USER) {
 				if ($event->getOldValue() === Participant::USER_SELF_JOINED) {
 					/** @var self $listener */
-					$listener = \OC::$server->query(self::class);
+					$listener = \OC::$server->get(self::class);
 					$listener->sendSystemMessage($room, 'user_added', ['user' => $attendee->getActorId()]);
 				} else {
 					/** @var self $listener */
-					$listener = \OC::$server->query(self::class);
+					$listener = \OC::$server->get(self::class);
 					$listener->sendSystemMessage($room, 'moderator_demoted', ['user' => $attendee->getActorId()]);
 				}
 			} elseif ($event->getNewValue() === Participant::GUEST_MODERATOR) {
 				/** @var self $listener */
-				$listener = \OC::$server->query(self::class);
+				$listener = \OC::$server->get(self::class);
 				$listener->sendSystemMessage($room, 'guest_moderator_promoted', ['session' => $attendee->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::GUEST) {
 				/** @var self $listener */
-				$listener = \OC::$server->query(self::class);
+				$listener = \OC::$server->get(self::class);
 				$listener->sendSystemMessage($room, 'guest_moderator_demoted', ['session' => $attendee->getActorId()]);
 			}
 		});
@@ -325,10 +325,10 @@ class Listener implements IEventListener {
 			}
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			/** @var Manager $manager */
-			$manager = \OC::$server->query(Manager::class);
+			$manager = \OC::$server->get(Manager::class);
 
 			$room = $manager->getRoomByToken($share->getSharedWith());
 			$metaData = \OC::$server->getRequest()->getParam('talkMetaData') ?? '';
diff --git a/lib/Collaboration/Resources/Listener.php b/lib/Collaboration/Resources/Listener.php
index 4701fb73f..9ab7685b6 100644
--- a/lib/Collaboration/Resources/Listener.php
+++ b/lib/Collaboration/Resources/Listener.php
@@ -40,7 +40,7 @@ class Listener {
 		$listener = static function (RoomEvent $event): void {
 			$room = $event->getRoom();
 			/** @var IManager $manager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = \OC::$server->get(IManager::class);
 
 			try {
 				$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
@@ -54,7 +54,7 @@ class Listener {
 		$listener = static function (AddParticipantsEvent $event): void {
 			$room = $event->getRoom();
 			/** @var IManager $manager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = \OC::$server->get(IManager::class);
 			/** @var IUserManager $userManager */
 			$userManager = \OC::$server->getUserManager();
 			try {
@@ -78,7 +78,7 @@ class Listener {
 		$listener = static function (RemoveUserEvent $event): void {
 			$room = $event->getRoom();
 			/** @var IManager $manager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = \OC::$server->get(IManager::class);
 			try {
 				$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
 			} catch (ResourceException $e) {
@@ -92,7 +92,7 @@ class Listener {
 		$listener = static function (RemoveParticipantEvent $event): void {
 			$room = $event->getRoom();
 			/** @var IManager $manager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = \OC::$server->get(IManager::class);
 			/** @var IUserManager $userManager */
 			$userManager = \OC::$server->getUserManager();
 			try {
@@ -113,7 +113,7 @@ class Listener {
 		$listener = static function (RoomEvent $event): void {
 			$room = $event->getRoom();
 			/** @var IManager $manager */
-			$resourceManager = \OC::$server->query(IManager::class);
+			$resourceManager = \OC::$server->get(IManager::class);
 
 			try {
 				$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
diff --git a/lib/Files/Listener.php b/lib/Files/Listener.php
index f4cd9784b..800ac8edd 100644
--- a/lib/Files/Listener.php
+++ b/lib/Files/Listener.php
@@ -75,7 +75,7 @@ class Listener {
 	public static function register(IEventDispatcher $dispatcher): void {
 		$listener = static function (JoinRoomUserEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			try {
 				$listener->preventUsersWithoutAccessToTheFileFromJoining($event->getRoom(), $event->getUser()->getUID());
@@ -88,7 +88,7 @@ class Listener {
 
 		$listener = static function (JoinRoomGuestEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 
 			try {
 				$listener->preventGuestsFromJoiningIfNotPubliclyAccessible($event->getRoom());
diff --git a/lib/Listener/RestrictStartingCalls.php b/lib/Listener/RestrictStartingCalls.php
index 58efb626f..2d924910a 100644
--- a/lib/Listener/RestrictStartingCalls.php
+++ b/lib/Listener/RestrictStartingCalls.php
@@ -47,7 +47,7 @@ class RestrictStartingCalls {
 	public static function register(IEventDispatcher $dispatcher): void {
 		$dispatcher->addListener(Room::EVENT_BEFORE_SESSION_JOIN_CALL, static function (ModifyParticipantEvent $event) {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->checkStartCallPermissions($event);
 		}, 1000);
 	}
diff --git a/lib/Notification/Listener.php b/lib/Notification/Listener.php
index 2919329e6..891a06e96 100644
--- a/lib/Notification/Listener.php
+++ b/lib/Notification/Listener.php
@@ -77,35 +77,35 @@ class Listener {
 			}
 
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->generateInvitation($room, $event->getParticipants());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_USERS_ADD, $listener);
 
 		$listener = static function (JoinRoomUserEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->markInvitationRead($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_ROOM_CONNECT, $listener);
 
 		$listener = static function (RoomEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->checkCallNotifications($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_BEFORE_SESSION_JOIN_CALL, $listener);
 
 		$listener = static function (RoomEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->sendCallNotifications($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_JOIN_CALL, $listener);
 
 		$listener = static function (RoomEvent $event): void {
 			/** @var self $listener */
-			$listener = \OC::$server->query(self::class);
+			$listener = \OC::$server->get(self::class);
 			$listener->markCallNotificationsRead($event->getRoom());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_JOIN_CALL, $listener);
diff --git a/lib/Share/Listener.php b/lib/Share/Listener.php
index f713e6ed4..cb8fdab4c 100644
--- a/lib/Share/Listener.php
+++ b/lib/Share/Listener.php
@@ -41,13 +41,13 @@ class Listener {
 
 	public static function listenPreShare(GenericEvent $event): void {
 		/** @var self $listener */
-		$listener = \OC::$server->query(self::class);
+		$listener = \OC::$server->get(self::class);
 		$listener->overwriteShareTarget($event);
 	}
 
 	public static function listenVerifyMountPointEvent(VerifyMountPointEvent $event): void {
 		/** @var self $listener */
-		$listener = \OC::$server->query(self::class);
+		$listener = \OC::$server->get(self::class);
 		$listener->overwriteMountPoint($event);
 	}
 
diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php
index d6ad8ab7e..788c61522 100644
--- a/lib/Share/RoomShareProvider.php
+++ b/lib/Share/RoomShareProvider.php
@@ -120,7 +120,7 @@ class RoomShareProvider implements IShareProvider {
 
 			if ($event->getParticipant()->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED) {
 				/** @var self $roomShareProvider */
-				$roomShareProvider = \OC::$server->query(self::class);
+				$roomShareProvider = \OC::$server->get(self::class);
 				$roomShareProvider->deleteInRoom($room->getToken(), $event->getParticipant()->getAttendee()->getActorId());
 			}
 		};
@@ -130,7 +130,7 @@ class RoomShareProvider implements IShareProvider {
 			$room = $event->getRoom();
 
 			/** @var self $roomShareProvider */
-			$roomShareProvider = \OC::$server->query(self::class);
+			$roomShareProvider = \OC::$server->get(self::class);
 			$roomShareProvider->deleteInRoom($room->getToken(), $event->getUser()->getUID());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_USER_REMOVE, $listener);
@@ -139,7 +139,7 @@ class RoomShareProvider implements IShareProvider {
 			$room = $event->getRoom();
 
 			/** @var self $roomShareProvider */
-			$roomShareProvider = \OC::$server->query(self::class);
+			$roomShareProvider = \OC::$server->get(self::class);
 			$roomShareProvider->deleteInRoom($room->getToken());
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_ROOM_DELETE, $listener);
diff --git a/lib/Signaling/Listener.php b/lib/Signaling/Listener.php
index 6b3e37554..1d9106d27 100644
--- a/lib/Signaling/Listener.php
+++ b/lib/Signaling/Listener.php
@@ -48,7 +48,7 @@ class Listener {
 
 	protected static function isUsingInternalSignaling(): bool {
 		/** @var Config $config */
-		$config = \OC::$server->query(Config::class);
+		$config = \OC::$server->get(Config::class);
 		return $config->getSignalingMode() === Config::SIGNALING_INTERNAL;
 	}
 
@@ -59,7 +59,7 @@ class Listener {
 			}
 
 			/** @var Messages $messages */
-			$messages = \OC::$server->query(Messages::class);
+			$messages = \OC::$server->get(Messages::class);
 			$messages->addMessageForAllParticipants($event->getRoom(), 'refresh-participant-list');
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_ROOM_CONNECT, $listener);
@@ -77,7 +77,7 @@ class Listener {
 			$room = $event->getRoom();
 
 			/** @var Messages $messages */
-			$messages = \OC::$server->query(Messages::class);
+			$messages = \OC::$server->get(Messages::class);
 			$messages->addMessageForAllParticipants($room, 'refresh-participant-list');
 		};
 		$dispatcher->addListener(Room::EVENT_BEFORE_USER_REMOVE, $listener);
@@ -92,7 +92,7 @@ class Listener {
 			}
 
 			/** @var Messages $messages */
-			$messages = \OC::$server->query(Messages::class);
+			$messages = \OC::$server->get(Messages::class);
 			$messages->addMessageForAllParticipants($room, 'refresh-participant-list');
 		};
 		$dispatcher->addListener(Room::EVENT_BEFORE_ROOM_DELETE, $listener);
@@ -105,7 +105,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$notifier->roomInvited($event->getRoom(), $event->getParticipants());
 		});
@@ -115,7 +115,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$notifier->roomModified($event->getRoom());
 		};
@@ -138,7 +138,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$sessionIds = [];
 			// If the participant is not active in the room the "participants"
@@ -146,7 +146,7 @@ class Listener {
 			// property.
 
 			/** @var SessionService $sessionService */
-			$sessionService = \OC::$server->query(SessionService::class);
+			$sessionService = \OC::$server->get(SessionService::class);
 			$sessions = $sessionService->getAllSessionsForAttendee($event->getParticipant()->getAttendee());
 			foreach ($sessions as $session) {
 				$sessionIds[] = $session->getSessionId();
@@ -163,9 +163,9 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 			/** @var ParticipantService $participantService */
-			$participantService = \OC::$server->query(ParticipantService::class);
+			$participantService = \OC::$server->get(ParticipantService::class);
 
 			$room = $event->getRoom();
 			$notifier->roomDeleted($room, $participantService->getParticipantUserIds($room));
@@ -176,7 +176,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$notifier->roomsDisinvited($event->getRoom(), [$event->getUser()->getUID()]);
 		});
@@ -186,12 +186,12 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$sessionIds = [];
 
 			/** @var SessionService $sessionService */
-			$sessionService = \OC::$server->query(SessionService::class);
+			$sessionService = \OC::$server->get(SessionService::class);
 			$sessions = $sessionService->getAllSessionsForAttendee($event->getParticipant()->getAttendee());
 			foreach ($sessions as $session) {
 				$sessionIds[] = $session->getSessionId();
@@ -212,7 +212,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$sessionIds = [];
 			if ($event->getParticipant()->getSession()) {
@@ -227,12 +227,12 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$sessionIds = [];
 
 			/** @var SessionService $sessionService */
-			$sessionService = \OC::$server->query(SessionService::class);
+			$sessionService = \OC::$server->get(SessionService::class);
 			$sessions = $sessionService->getAllSessionsForAttendee($event->getParticipant()->getAttendee());
 			foreach ($sessions as $session) {
 				$sessionIds[] = $session->getSessionId();
@@ -256,7 +256,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			// TODO: The list of removed session ids should be passed through the event
 			// so the signaling server can optimize forwarding the message.
@@ -269,12 +269,12 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$sessionIds = [];
 
 			/** @var SessionService $sessionService */
-			$sessionService = \OC::$server->query(SessionService::class);
+			$sessionService = \OC::$server->get(SessionService::class);
 			$sessions = $sessionService->getAllSessionsForAttendee($event->getParticipant()->getAttendee());
 			foreach ($sessions as $session) {
 				$sessionIds[] = $session->getSessionId();
@@ -290,7 +290,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$room = $event->getRoom();
 			$message = [
@@ -307,7 +307,7 @@ class Listener {
 			}
 
 			/** @var BackendNotifier $notifier */
-			$notifier = \OC::$server->query(BackendNotifier::class);
+			$notifier = \OC::$server->get(BackendNotifier::class);
 
 			$room = $event->getRoom();
 			$message = [