nextcloud / server

lib/public/Collaboration/Collaborators/ISearchResult.php

Indentation +42 added lines, -42 removed lines

@@ -29,52 +29,52 @@
  * @since 13.0.0
  */
 interface ISearchResult {
-	/**
-	 * @param SearchResultType $type
-	 * @param array $matches
-	 * @param array|null $exactMatches
-	 * @since 13.0.0
-	 */
-	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null);
+    /**
+     * @param SearchResultType $type
+     * @param array $matches
+     * @param array|null $exactMatches
+     * @since 13.0.0
+     */
+    public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null);
 
-	/**
-	 * @param SearchResultType $type
-	 * @param string $collaboratorId
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasResult(SearchResultType $type, $collaboratorId);
+    /**
+     * @param SearchResultType $type
+     * @param string $collaboratorId
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasResult(SearchResultType $type, $collaboratorId);
 
-	/**
-	 * Removes all result where $collaborationId exactly matches shareWith of
-	 * any of wide and exact result matches of the given type.
-	 *
-	 * @since 22.0.0
-	 */
-	public function removeCollaboratorResult(SearchResultType $type, string $collaboratorId): bool;
+    /**
+     * Removes all result where $collaborationId exactly matches shareWith of
+     * any of wide and exact result matches of the given type.
+     *
+     * @since 22.0.0
+     */
+    public function removeCollaboratorResult(SearchResultType $type, string $collaboratorId): bool;
 
-	/**
-	 * @param SearchResultType $type
-	 * @since 13.0.0
-	 */
-	public function unsetResult(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @since 13.0.0
+     */
+    public function unsetResult(SearchResultType $type);
 
-	/**
-	 * @param SearchResultType $type
-	 * @since 13.0.0
-	 */
-	public function markExactIdMatch(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @since 13.0.0
+     */
+    public function markExactIdMatch(SearchResultType $type);
 
-	/**
-	 * @param SearchResultType $type
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasExactIdMatch(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasExactIdMatch(SearchResultType $type);
 
-	/**
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function asArray();
+    /**
+     * @return array
+     * @since 13.0.0
+     */
+    public function asArray();
 }

lib/private/Collaboration/Collaborators/Search.php

Indentation +107 added lines, -107 removed lines

@@ -35,111 +35,111 @@
 use OCP\Share;
 
 class Search implements ISearch {
-	/** @var IContainer */
-	private $c;
-
-	protected $pluginList = [];
-
-	public function __construct(IContainer $c) {
-		$this->c = $c;
-	}
-
-	/**
-	 * @param string $search
-	 * @param array $shareTypes
-	 * @param bool $lookup
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function search($search, array $shareTypes, $lookup, $limit, $offset) {
-		$hasMoreResults = false;
-
-		// Trim leading and trailing whitespace characters, e.g. when query is copy-pasted
-		$search = trim($search);
-
-		/** @var ISearchResult $searchResult */
-		$searchResult = $this->c->resolve(SearchResult::class);
-
-		foreach ($shareTypes as $type) {
-			if (!isset($this->pluginList[$type])) {
-				continue;
-			}
-			foreach ($this->pluginList[$type] as $plugin) {
-				/** @var ISearchPlugin $searchPlugin */
-				$searchPlugin = $this->c->resolve($plugin);
-				$hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults;
-			}
-		}
-
-		// Get from lookup server, not a separate share type
-		if ($lookup) {
-			$searchPlugin = $this->c->resolve(LookupPlugin::class);
-			$hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults;
-		}
-
-		// sanitizing, could go into the plugins as well
-
-		// if we have an exact match, either for the federated cloud id or for the
-		// email address, we only return the exact match. It is highly unlikely
-		// that the exact same email address and federated cloud id exists
-		$emailType = new SearchResultType('emails');
-		$remoteType = new SearchResultType('remotes');
-		if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($remoteType);
-		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($emailType);
-		}
-
-		$this->dropMailSharesWhereRemoteShareIsPossible($searchResult);
-
-		// if we have an exact local user match with an email-a-like query,
-		// there is no need to show the remote and email matches.
-		$userType = new SearchResultType('users');
-		if (strpos($search, '@') !== false && $searchResult->hasExactIdMatch($userType)) {
-			$searchResult->unsetResult($remoteType);
-			$searchResult->unsetResult($emailType);
-		}
-
-		return [$searchResult->asArray(), $hasMoreResults];
-	}
-
-	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if ($shareType === null) {
-			throw new \InvalidArgumentException('Provided ShareType is invalid');
-		}
-		$this->pluginList[$shareType][] = $pluginInfo['class'];
-	}
-
-	protected function dropMailSharesWhereRemoteShareIsPossible(ISearchResult $searchResult): void {
-		$allResults = $searchResult->asArray();
-
-		$emailType = new SearchResultType('emails');
-		$remoteType = new SearchResultType('remotes');
-
-		if (!isset($allResults[$remoteType->getLabel()])
-			|| !isset($allResults[$emailType->getLabel()])) {
-			return;
-		}
-
-		$mailIdMap = [];
-		foreach ($allResults[$emailType->getLabel()] as $mailRow) {
-			// sure, array_reduce looks nicer, but foreach needs less resources and is faster
-			if (!isset($mailRow['uuid'])) {
-				continue;
-			}
-			$mailIdMap[$mailRow['uuid']] = $mailRow['value']['shareWith'];
-		}
-
-		foreach ($allResults[$remoteType->getLabel()] as $resultRow) {
-			if (!isset($resultRow['uuid'])) {
-				continue;
-			}
-			if (isset($mailIdMap[$resultRow['uuid']])) {
-				$searchResult->removeCollaboratorResult($emailType, $mailIdMap[$resultRow['uuid']]);
-			}
-		}
-	}
+    /** @var IContainer */
+    private $c;
+
+    protected $pluginList = [];
+
+    public function __construct(IContainer $c) {
+        $this->c = $c;
+    }
+
+    /**
+     * @param string $search
+     * @param array $shareTypes
+     * @param bool $lookup
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function search($search, array $shareTypes, $lookup, $limit, $offset) {
+        $hasMoreResults = false;
+
+        // Trim leading and trailing whitespace characters, e.g. when query is copy-pasted
+        $search = trim($search);
+
+        /** @var ISearchResult $searchResult */
+        $searchResult = $this->c->resolve(SearchResult::class);
+
+        foreach ($shareTypes as $type) {
+            if (!isset($this->pluginList[$type])) {
+                continue;
+            }
+            foreach ($this->pluginList[$type] as $plugin) {
+                /** @var ISearchPlugin $searchPlugin */
+                $searchPlugin = $this->c->resolve($plugin);
+                $hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults;
+            }
+        }
+
+        // Get from lookup server, not a separate share type
+        if ($lookup) {
+            $searchPlugin = $this->c->resolve(LookupPlugin::class);
+            $hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults;
+        }
+
+        // sanitizing, could go into the plugins as well
+
+        // if we have an exact match, either for the federated cloud id or for the
+        // email address, we only return the exact match. It is highly unlikely
+        // that the exact same email address and federated cloud id exists
+        $emailType = new SearchResultType('emails');
+        $remoteType = new SearchResultType('remotes');
+        if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($remoteType);
+        } elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($emailType);
+        }
+
+        $this->dropMailSharesWhereRemoteShareIsPossible($searchResult);
+
+        // if we have an exact local user match with an email-a-like query,
+        // there is no need to show the remote and email matches.
+        $userType = new SearchResultType('users');
+        if (strpos($search, '@') !== false && $searchResult->hasExactIdMatch($userType)) {
+            $searchResult->unsetResult($remoteType);
+            $searchResult->unsetResult($emailType);
+        }
+
+        return [$searchResult->asArray(), $hasMoreResults];
+    }
+
+    public function registerPlugin(array $pluginInfo) {
+        $shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
+        if ($shareType === null) {
+            throw new \InvalidArgumentException('Provided ShareType is invalid');
+        }
+        $this->pluginList[$shareType][] = $pluginInfo['class'];
+    }
+
+    protected function dropMailSharesWhereRemoteShareIsPossible(ISearchResult $searchResult): void {
+        $allResults = $searchResult->asArray();
+
+        $emailType = new SearchResultType('emails');
+        $remoteType = new SearchResultType('remotes');
+
+        if (!isset($allResults[$remoteType->getLabel()])
+            || !isset($allResults[$emailType->getLabel()])) {
+            return;
+        }
+
+        $mailIdMap = [];
+        foreach ($allResults[$emailType->getLabel()] as $mailRow) {
+            // sure, array_reduce looks nicer, but foreach needs less resources and is faster
+            if (!isset($mailRow['uuid'])) {
+                continue;
+            }
+            $mailIdMap[$mailRow['uuid']] = $mailRow['value']['shareWith'];
+        }
+
+        foreach ($allResults[$remoteType->getLabel()] as $resultRow) {
+            if (!isset($resultRow['uuid'])) {
+                continue;
+            }
+            if (isset($mailIdMap[$resultRow['uuid']])) {
+                $searchResult->removeCollaboratorResult($emailType, $mailIdMap[$resultRow['uuid']]);
+            }
+        }
+    }
 }

lib/private/Collaboration/Collaborators/SearchResult.php

Indentation +76 added lines, -76 removed lines

@@ -29,80 +29,80 @@
 use OCP\Collaboration\Collaborators\SearchResultType;
 
 class SearchResult implements ISearchResult {
-	protected $result = [
-		'exact' => [],
-	];
-
-	protected $exactIdMatches = [];
-
-	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null) {
-		$type = $type->getLabel();
-		if (!isset($this->result[$type])) {
-			$this->result[$type] = [];
-			$this->result['exact'][$type] = [];
-		}
-
-		$this->result[$type] = array_merge($this->result[$type], $matches);
-		if (is_array($exactMatches)) {
-			$this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
-		}
-	}
-
-	public function markExactIdMatch(SearchResultType $type) {
-		$this->exactIdMatches[$type->getLabel()] = 1;
-	}
-
-	public function hasExactIdMatch(SearchResultType $type) {
-		return isset($this->exactIdMatches[$type->getLabel()]);
-	}
-
-	public function hasResult(SearchResultType $type, $collaboratorId) {
-		$type = $type->getLabel();
-		if (!isset($this->result[$type])) {
-			return false;
-		}
-
-		$resultArrays = [$this->result['exact'][$type], $this->result[$type]];
-		foreach ($resultArrays as $resultArray) {
-			foreach ($resultArray as $result) {
-				if ($result['value']['shareWith'] === $collaboratorId) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public function asArray() {
-		return $this->result;
-	}
-
-	public function unsetResult(SearchResultType $type) {
-		$type = $type->getLabel();
-		$this->result[$type] = [];
-		if (isset($this->result['exact'][$type])) {
-			$this->result['exact'][$type] = [];
-		}
-	}
-
-	public function removeCollaboratorResult(SearchResultType $type, string $collaboratorId): bool {
-		$type = $type->getLabel();
-		if (!isset($this->result[$type])) {
-			return false;
-		}
-
-		$actionDone = false;
-		$resultArrays = [&$this->result['exact'][$type], &$this->result[$type]];
-		foreach ($resultArrays as &$resultArray) {
-			foreach ($resultArray as $k => $result) {
-				if ($result['value']['shareWith'] === $collaboratorId) {
-					unset($resultArray[$k]);
-					$actionDone = true;
-				}
-			}
-		}
-
-		return $actionDone;
-	}
+    protected $result = [
+        'exact' => [],
+    ];
+
+    protected $exactIdMatches = [];
+
+    public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null) {
+        $type = $type->getLabel();
+        if (!isset($this->result[$type])) {
+            $this->result[$type] = [];
+            $this->result['exact'][$type] = [];
+        }
+
+        $this->result[$type] = array_merge($this->result[$type], $matches);
+        if (is_array($exactMatches)) {
+            $this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
+        }
+    }
+
+    public function markExactIdMatch(SearchResultType $type) {
+        $this->exactIdMatches[$type->getLabel()] = 1;
+    }
+
+    public function hasExactIdMatch(SearchResultType $type) {
+        return isset($this->exactIdMatches[$type->getLabel()]);
+    }
+
+    public function hasResult(SearchResultType $type, $collaboratorId) {
+        $type = $type->getLabel();
+        if (!isset($this->result[$type])) {
+            return false;
+        }
+
+        $resultArrays = [$this->result['exact'][$type], $this->result[$type]];
+        foreach ($resultArrays as $resultArray) {
+            foreach ($resultArray as $result) {
+                if ($result['value']['shareWith'] === $collaboratorId) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function asArray() {
+        return $this->result;
+    }
+
+    public function unsetResult(SearchResultType $type) {
+        $type = $type->getLabel();
+        $this->result[$type] = [];
+        if (isset($this->result['exact'][$type])) {
+            $this->result['exact'][$type] = [];
+        }
+    }
+
+    public function removeCollaboratorResult(SearchResultType $type, string $collaboratorId): bool {
+        $type = $type->getLabel();
+        if (!isset($this->result[$type])) {
+            return false;
+        }
+
+        $actionDone = false;
+        $resultArrays = [&$this->result['exact'][$type], &$this->result[$type]];
+        foreach ($resultArrays as &$resultArray) {
+            foreach ($resultArray as $k => $result) {
+                if ($result['value']['shareWith'] === $collaboratorId) {
+                    unset($resultArray[$k]);
+                    $actionDone = true;
+                }
+            }
+        }
+
+        return $actionDone;
+    }
 }