Merge pull request #7857 from nextcloud/fix/noid/switch-to-probecircles

fix(teams): use lighter probeCircles()

Author: ArtificialOwl

lib/Service/CirclesService.php

@@ -14,6 +14,7 @@
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Probes\CircleProbe;
+use OCA\Circles\Model\Probes\DataProbe;
 use OCP\App\IAppManager;
 use OCP\Server;
 use Throwable;
@@ -45,7 +46,9 @@ public function getCircle(string $circleId): ?Circle {
 			// Enforce current user condition since we always want the full list of members
 			$circlesManager = Server::get(CirclesManager::class);
 			$circlesManager->startSuperSession();
-			return $circlesManager->getCircle($circleId);
+			$dataProbe = new DataProbe();
+			$dataProbe->add(DataProbe::OWNER);
+			return $circlesManager->probeCircle($circleId, null, $dataProbe);
 		} catch (Throwable $e) {
 		}
 		return null;
@@ -64,7 +67,9 @@ public function isUserInCircle(string $circleId, string $userId): bool {
 			$circlesManager = Server::get(CirclesManager::class);
 			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
 			$circlesManager->startSession($federatedUser);
-			$circle = $circlesManager->getCircle($circleId);
+			$dataProbe = new DataProbe();
+			$dataProbe->add(DataProbe::INITIATOR);
+			$circle = $circlesManager->probeCircle($circleId, null, $dataProbe);
 			$member = $circle->getInitiator();
 			$isUserInCircle = $member->getLevel() >= Member::LEVEL_MEMBER;
 
@@ -96,7 +101,7 @@ public function getUserCircles(string $userId): array {
 			$probe->mustBeMember();
 			return array_map(function (Circle $circle) {
 				return $circle->getSingleId();
-			}, $circlesManager->getCircles($probe));
+			}, $circlesManager->probeCircles($probe));
 		} catch (Throwable $e) {
 		}
 		return [];

tests/stub.phpstub

@@ -99,17 +99,27 @@ namespace OCA\Circles\Model\Probes {
 		public function __construct() {}
 		public function mustBeMember(bool $must = true): self {}
 	}
+	class DataProbe {
+		public const OWNER = 'd';
+		public const INITIATOR = 'h';
+		public function __construct() {}
+		public function add(string $key, array $path = []): self {}
+		public function mustBeMember(bool $must = true): self {}
+	}
 }
 
 namespace OCA\Circles {
 	use OCA\Circles\Model\Circle;
 	use OCA\Circles\Model\FederatedUser;
 	use OCA\Circles\Model\Probes\CircleProbe;
+	use OCA\Circles\Model\Probes\DataProbe;
 	class CirclesManager {
 		public function startSuperSession(): void {}
 		public function startSession(?FederatedUser $federatedUser = null): void {}
 		public function getCircles(?CircleProbe $probe = null): array {}
 		public function getCircle(string $singleId, ?CircleProbe $probe = null): Circle {}
+		public function probeCircles(?CircleProbe $circleProbe = null, ?DataProbe $dataProbe = null): array {}
+		public function probeCircle(string $singleId, ?CircleProbe $probe = null, ?DataProbe $dataProbe = null): Circle {}
 		public function getFederatedUser(string $federatedId, int $type = Member::TYPE_SINGLE): FederatedUser {}
 	}
 }