[stable22] owner of NO_OWNER should not have memberships cached

lib/Db/CircleRequest.php

@@ -355,7 +355,12 @@ public function searchCircle(Circle $circle, ?IFederatedUser $initiator = null):
 		}
 
 		if (!is_null($initiator)) {
-			$qb->setOptions([CoreQueryBuilder::CIRCLE], ['getData' => true]);
+			$qb->setOptions(
+				[CoreQueryBuilder::CIRCLE], [
+					'getData' => true,
+					'initiatorDirectMember' => true
+				]
+			);
 			$qb->limitToInitiator(CoreQueryBuilder::CIRCLE, $initiator);
 		}
 

lib/Db/CoreQueryBuilder.php

@@ -126,6 +126,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
 				self::MEMBERSHIPS => [
 					self::CONFIG
 				],
+				self::DIRECT_INITIATOR,
 				self::INITIATOR => [
 					self::OPTIONS => [
 						'minimumLevel' => Member::LEVEL_MEMBER
@@ -1156,15 +1157,40 @@ public function leftJoinInitiator(
 			)
 		);
 
+
+		$listMembershipCircleAlias = [$aliasMembership];
+		if ($this->getBool('initiatorDirectMember', $options, false)) {
+			try {
+				$aliasDirectInitiator = $this->generateAlias($alias, self::DIRECT_INITIATOR, $options);
+				$listMembershipCircleAlias[] = $aliasDirectInitiator;
+			} catch (RequestBuilderException $e) {
+				// meaning that this path does not require DIRECT_INITIATOR; can be safely ignored
+			}
+		}
+
 		try {
 			$aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options);
+			$orXMembershipCircle = $expr->orX();
+			array_map(
+				function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) {
+					$orXMembershipCircle->add(
+						$this->expr()->eq(
+							$alias . '.circle_id',
+							$aliasMembershipCircle . '.unique_id'
+						)
+					);
+				},
+				$listMembershipCircleAlias
+			);
+
 			$this->leftJoin(
 				$aliasMembership,
 				CoreRequestBuilder::TABLE_CIRCLE,
 				$aliasMembershipCircle,
-				$expr->eq($aliasMembership . '.circle_id', $aliasMembershipCircle . '.unique_id')
+				$orXMembershipCircle
 			);
 		} catch (RequestBuilderException $e) {
+			// meaning that this path (ie. self::$SQL_PATH) does not require CONFIG; can be safely ignored
 		}
 
 		if (!$this->getBool('getData', $options, false)) {
@@ -1175,7 +1201,6 @@ public function leftJoinInitiator(
 		if ($this->getBool('initiatorDirectMember', $options, false)) {
 			try {
 				$aliasDirectInitiator = $this->generateAlias($alias, self::DIRECT_INITIATOR, $options);
-
 				$this->generateMemberSelectAlias($aliasDirectInitiator)
 					 ->leftJoin(
 						 $helperAlias,
@@ -1187,6 +1212,7 @@ public function leftJoinInitiator(
 						 )
 					 );
 			} catch (RequestBuilderException $e) {
+				// meaning that this path does not require DIRECT_INITIATOR; can be safely ignored
 			}
 		}
 
@@ -1264,13 +1290,27 @@ protected function limitInitiatorVisibility(string $alias): ICompositeExpression
 
 		$minimumLevel = $this->getInt('minimumLevel', $options);
 		$andXMember = $expr->andX();
-		$andXMember->add(
-			$this->orXCheckLevel($levelCheck, $minimumLevel)
+		$orXLevelCheck = $expr->orX();
+
+		array_map(
+			function (string $alias) use ($orXLevelCheck, $minimumLevel) {
+				$orXLevelCheck->add(
+					$this->expr()->gte(
+						$alias . '.level',
+						$this->createNamedParameter($minimumLevel)
+					)
+				);
+			},
+			$levelCheck
 		);
+		$andXMember->add($orXLevelCheck);
 
 		if (!$this->getBool('includePersonalCircles', $options, false)) {
 			$andXMember->add(
-				$this->exprFilterBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle)
+				$this->exprFilterBitwise(
+					'config', Circle::CFG_PERSONAL,
+					$aliasMembershipCircle
+				)
 			);
 		}
 		$orX->add($andXMember);
@@ -1625,21 +1665,4 @@ public function getAvailablePath(string $prefix): array {
 
 		return $path;
 	}
-
-
-	/**
-	 * @param array $aliases
-	 * @param int $level
-	 *
-	 * @return ICompositeExpression
-	 */
-	private function orXCheckLevel(array $aliases, int $level): ICompositeExpression {
-		$expr = $this->expr();
-		$orX = $expr->orX();
-		foreach ($aliases as $alias) {
-			$orX->add($expr->gte($alias . '.level', $this->createNamedParameter($level)));
-		}
-
-		return $orX;
-	}
 }

lib/Model/Probes/MemberProbe.php

@@ -34,7 +34,7 @@
 use OCA\Circles\Model\Member;
 
 /**
- * Class CircleProbe
+ * Class MemberProbe
  *
  * @package OCA\Circles\Model\Probes
  */
@@ -50,6 +50,9 @@ class MemberProbe extends BasicProbe {
 	/** @var bool */
 	private $requestingMembership = false;
 
+	/** @var bool */
+	private $initiatorDirectMember = false;
+
 
 	/**
 	 * allow the initiator as a requesting member
@@ -72,6 +75,25 @@ public function isRequestingMembership(): bool {
 	}
 
 
+	/**
+	 * @param bool $include
+	 *
+	 * @return $this
+	 */
+	public function initiatorAsDirectMember(bool $include = true): self {
+		$this->initiatorDirectMember = $include;
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function directMemberInitiator(): bool {
+		return $this->initiatorDirectMember;
+	}
+
+
 	/**
 	 * force the generation an initiator if visitor
 	 *
@@ -144,7 +166,8 @@ public function getAsOptions(): array {
 			[
 				'minimumLevel' => $this->getMinimumLevel(),
 				'emulateVisitor' => $this->isEmulatingVisitor(),
-				'allowRequestingMembership' => $this->isRequestingMembership()
+				'allowRequestingMembership' => $this->isRequestingMembership(),
+				'initiatorDirectMember' => $this->directMemberInitiator(),
 			],
 			parent::getAsOptions()
 		);

lib/Service/MemberService.php

@@ -178,6 +178,7 @@ public function getMembers(string $circleId): array {
 		if ($this->federatedUserService->hasRemoteInstance()) {
 			$probe->setFilterRemoteInstance($this->federatedUserService->getRemoteInstance());
 		}
+		$probe->initiatorAsDirectMember();
 		$probe->mustBeMember();
 
 		return $this->memberRequest->getMembers(

lib/Service/MembershipService.php

@@ -40,6 +40,7 @@
 use OCA\Circles\Exceptions\MembershipNotFoundException;
 use OCA\Circles\Exceptions\OwnerNotFoundException;
 use OCA\Circles\Exceptions\RequestBuilderException;
+use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\FederatedUser;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Membership;
@@ -139,6 +140,7 @@ public function manageMemberships(string $singleId): int {
 	/**
 	 * @param string $circleId
 	 * @param string $singleId
+	 * @param bool $detailed
 	 *
 	 * @return Membership
 	 * @throws MembershipNotFoundException
@@ -199,6 +201,11 @@ private function generateMemberships(
 				continue;
 			}
 
+			if ($member->getCircle()->isConfig(Circle::CFG_NO_OWNER)
+				&& $member->getLevel() === Member::LEVEL_OWNER) {
+				continue;
+			}
+
 			$membership = new Membership($singleId, count($path) > 1 ? $path[1] : '', $member);
 			$membership->setInheritancePath(array_reverse($path))
 					   ->setInheritanceDepth(sizeof($path));