Skip to content

Commit a1654e0

Browse files
committed
fix(teams): use lighter probeCircles()
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
1 parent 32a68c4 commit a1654e0

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/Service/CirclesService.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use OCA\Circles\Model\Circle;
1515
use OCA\Circles\Model\Member;
1616
use OCA\Circles\Model\Probes\CircleProbe;
17+
use OCA\Circles\Model\Probes\DataProbe;
1718
use OCP\App\IAppManager;
1819
use OCP\Server;
1920
use Throwable;
@@ -45,7 +46,9 @@ public function getCircle(string $circleId): ?Circle {
4546
// Enforce current user condition since we always want the full list of members
4647
$circlesManager = Server::get(CirclesManager::class);
4748
$circlesManager->startSuperSession();
48-
return $circlesManager->getCircle($circleId);
49+
$dataProbe = new DataProbe();
50+
$dataProbe->add(DataProbe::OWNER);
51+
return $circlesManager->probeCircle($circleId, null, $dataProbe);
4952
} catch (Throwable $e) {
5053
}
5154
return null;
@@ -64,7 +67,9 @@ public function isUserInCircle(string $circleId, string $userId): bool {
6467
$circlesManager = Server::get(CirclesManager::class);
6568
$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
6669
$circlesManager->startSession($federatedUser);
67-
$circle = $circlesManager->getCircle($circleId);
70+
$dataProbe = new DataProbe();
71+
$dataProbe->add(DataProbe::INITIATOR);
72+
$circle = $circlesManager->probeCircle($circleId, null, $dataProbe);
6873
$member = $circle->getInitiator();
6974
$isUserInCircle = $member->getLevel() >= Member::LEVEL_MEMBER;
7075

@@ -96,7 +101,7 @@ public function getUserCircles(string $userId): array {
96101
$probe->mustBeMember();
97102
return array_map(function (Circle $circle) {
98103
return $circle->getSingleId();
99-
}, $circlesManager->getCircles($probe));
104+
}, $circlesManager->probeCircles($probe));
100105
} catch (Throwable $e) {
101106
}
102107
return [];

0 commit comments

Comments
 (0)