Merge pull request #2015 from nextcloud/backport/1969/stable31

Author: provokateurin

lib/Command/MembersList.php

@@ -307,7 +307,7 @@ private function getMembers(
 			}
 		} else {
 			$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true);
-			$members = $this->memberService->getMembers($circleId);
+			$members = $this->memberService->getMembers($circleId, true);
 		}
 
 		if (!is_null($tree)) {

lib/Controller/RemoteController.php

@@ -306,7 +306,7 @@ public function members(string $circleId): DataResponse {
 		}
 
 		try {
-			$members = $this->memberService->getMembers($circleId);
+			$members = $this->memberService->getMembers($circleId, true);
 
 			return new DataResponse($members);
 		} catch (Exception $e) {

lib/Db/MemberRequest.php

@@ -199,6 +199,7 @@ public function getMembers(
 		?IFederatedUser $initiator = null,
 		?MemberProbe $probe = null,
 		int $limit = 0,
+		bool $fullDetails = false,
 	): array {
 		if (is_null($probe)) {
 			$probe = new MemberProbe();
@@ -218,8 +219,10 @@ public function getMembers(
 			)
 		);
 
-		$qb->leftJoinCircle(CoreQueryBuilder::MEMBER, $initiator);
-		$qb->leftJoinInvitedBy(CoreQueryBuilder::MEMBER);
+		if ($fullDetails) {
+			$qb->leftJoinCircle(CoreQueryBuilder::MEMBER, $initiator);
+			$qb->leftJoinInvitedBy(CoreQueryBuilder::MEMBER);
+		}
 
 		if ($probe->hasFilterRemoteInstance()) {
 			$aliasCircle = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::CIRCLE);

lib/Service/MemberService.php

@@ -151,7 +151,7 @@ public function getMemberById(
 	 * @throws InitiatorNotFoundException
 	 * @throws RequestBuilderException
 	 */
-	public function getMembers(string $circleId): array {
+	public function getMembers(string $circleId, bool $fullDetails = false): array {
 		$this->federatedUserService->mustHaveCurrentUser();
 
 		$probe = new MemberProbe();
@@ -164,7 +164,8 @@ public function getMembers(string $circleId): array {
 		return $this->memberRequest->getMembers(
 			$circleId,
 			$this->federatedUserService->getCurrentUser(),
-			$probe
+			$probe,
+			fullDetails: $fullDetails
 		);
 	}