Merge pull request #727 from nextcloud/backport/726/stable22

[stable22] remove root circles from search for new members
nextcloud · Jul 22, 2021 · 144622a · 144622a
2 parents 5a780d7 + f7d3a77
commit 144622a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/Collaboration/v2/CollaboratorSearchPlugin.php b/lib/Collaboration/v2/CollaboratorSearchPlugin.php
@@ -115,7 +115,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
 				  ->setItemsLimit($limit)
 				  ->setItemsOffset($offset)
 				  ->setFilterCircle($filterCircle)
-				  ->mustBeMember(!$fromFrontEnd);
+				  ->mustBeMember(!$fromFrontEnd)
+				  ->filterConfig(Circle::CFG_ROOT, $fromFrontEnd);
 
 			$circles = $this->circleService->getCircles($probe);
 		} catch (Exception $e) {

diff --git a/lib/Model/Probes/CircleProbe.php b/lib/Model/Probes/CircleProbe.php
@@ -214,6 +214,22 @@ public function filterBackendCircles(bool $filter = true): self {
 	}
 
 
+	/**
+	 * @param int $config
+	 * @param bool $filter
+	 *
+	 * @return $this
+	 */
+	public function filterConfig(int $config, bool $filter = true): self {
+		$this->filter |= $config;
+		if (!$filter) {
+			$this->filter -= $config;
+		}
+
+		return $this;
+	}
+
+
 	/**
 	 * @return int
 	 */