Skip to content

Feat: Add role-based filtering for circle member queries #2482

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

Merged
mejo- merged 1 commit into from
Jun 1, 2026
+12 −4
Merged

Feat: Add role-based filtering for circle member queries #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/Controller/LocalController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,17 @@ public function probeCircles(int $limit = -1, int $offset = 0): DataResponse {
* @param bool $fullDetails
* @param int $limit
* @param string $search
* @param int|null $role
*
* @return DataResponse
* @throws OCSException
*/
#[NoAdminRequired]
public function members(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = ''): DataResponse {
public function members(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = '', ?int $role = null): DataResponse {
try {
$this->setCurrentFederatedUser();

return new DataResponse($this->serializeArray($this->memberService->getMembers($circleId, $fullDetails, $limit, $search)));
return new DataResponse($this->serializeArray($this->memberService->getMembers($circleId, $fullDetails, $limit, $search, $role)));
} catch (Exception $e) {
$this->e($e, ['circleId' => $circleId]);
throw new OCSException($e->getMessage(), (int)$e->getCode());
Expand Down
5 changes: 5 additions & 0 deletions lib/Db/MemberRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ public function getMembers(
int $limit = 0,
bool $fullDetails = false,
string $search = '',
?int $role = null,
): array {
if (is_null($probe)) {
$probe = new MemberProbe();
Expand Down Expand Up @@ -257,6 +258,10 @@ public function getMembers(
$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $probe->getFilterMember());
}

if ($role !== null) {
$qb->andWhere($qb->expr()->eq($qb->getDefaultSelectAlias() . '.level', $qb->createNamedParameter($role)));
}

$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');

Expand Down
6 changes: 4 additions & 2 deletions lib/Service/MemberService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,13 @@ public function getMemberById(
* @param bool $fullDetails
* @param int $limit
* @param string $search
* @param ?int $role
*
* @return Member[]
* @throws InitiatorNotFoundException
* @throws RequestBuilderException
*/
public function getMembers(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = ''): array {
public function getMembers(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = '', ?int $role = null): array {
$this->federatedUserService->mustHaveCurrentUser();

$probe = new MemberProbe();
Expand All @@ -151,7 +152,8 @@ public function getMembers(string $circleId, bool $fullDetails = false, int $lim
$probe,
$limit,
$fullDetails,
$search
$search,
$role,
);
}

Expand Down
Loading