Skip to content

Commit baed159

Browse files
committed
Catch a missing resource, so the tests work again
Signed-off-by: Joas Schilling <[email protected]>
1 parent bd1ee24 commit baed159

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

lib/Collaboration/Resources/Listener.php

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use OCA\Spreed\Participant;
2626
use OCA\Spreed\Room;
2727
use OCP\Collaboration\Resources\IManager;
28+
use OCP\Collaboration\Resources\ResourceException;
2829
use OCP\IUser;
2930
use OCP\IUserManager;
3031
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -38,7 +39,11 @@ public static function register(EventDispatcherInterface $dispatcher): void {
3839
/** @var IManager $manager */
3940
$resourceManager = \OC::$server->query(IManager::class);
4041

41-
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
42+
try {
43+
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
44+
} catch (ResourceException $e) {
45+
return;
46+
}
4247
$resourceManager->invalidateAccessCacheForResource($resource);
4348
};
4449
$dispatcher->addListener(Room::class . '::postDeleteRoom', $listener);
@@ -50,7 +55,11 @@ public static function register(EventDispatcherInterface $dispatcher): void {
5055
$resourceManager = \OC::$server->query(IManager::class);
5156
/** @var IUserManager $userManager */
5257
$userManager = \OC::$server->getUserManager();
53-
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
58+
try {
59+
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
60+
} catch (ResourceException $e) {
61+
return;
62+
}
5463

5564
$participants = $event->getArgument('users');
5665
foreach ($participants as $participant) {
@@ -71,7 +80,11 @@ public static function register(EventDispatcherInterface $dispatcher): void {
7180
$resourceManager = \OC::$server->query(IManager::class);
7281
/** @var IUser $user */
7382
$user = $event->getArgument('user');
74-
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
83+
try {
84+
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
85+
} catch (ResourceException $e) {
86+
return;
87+
}
7588

7689
$resourceManager->invalidateAccessCacheForResourceByUser($resource, $user);
7790
};
@@ -84,7 +97,11 @@ public static function register(EventDispatcherInterface $dispatcher): void {
8497
$resourceManager = \OC::$server->query(IManager::class);
8598
/** @var IUserManager $userManager */
8699
$userManager = \OC::$server->getUserManager();
87-
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
100+
try {
101+
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
102+
} catch (ResourceException $e) {
103+
return;
104+
}
88105

89106
/** @var Participant $participant */
90107
$participant = $event->getArgument('participant');
@@ -99,7 +116,11 @@ public static function register(EventDispatcherInterface $dispatcher): void {
99116
/** @var IManager $manager */
100117
$resourceManager = \OC::$server->query(IManager::class);
101118

102-
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
119+
try {
120+
$resource = $resourceManager->getResourceForUser('room', $room->getToken(), null);
121+
} catch (ResourceException $e) {
122+
return;
123+
}
103124
$resourceManager->invalidateAccessCacheForResourceByUser($resource, null);
104125
};
105126
$dispatcher->addListener(Room::class . '::postChangeType', $listener);

0 commit comments

Comments
 (0)