Skip to content

fix(teams): use lighter probeCircles() #7857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArtificialOwl wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −3
Open

fix(teams): use lighter probeCircles() #7857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1654e0
fix(teams): use lighter probeCircles()
ArtificialOwl Apr 16, 2026
298f567
adding probeCircle/probeCircles
ArtificialOwl Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/Service/CirclesService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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 [];
Expand Down
10 changes: 10 additions & 0 deletions tests/stub.phpstub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
}
}
Expand Down
Loading