fix: trim duplicate search results for external share

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>

Author: n-iv

lib/private/Collaboration/Collaborators/Search.php

@@ -98,13 +98,17 @@ protected function dropMailSharesWhereRemoteShareIsPossible(ISearchResult $searc
 		$emailType = new SearchResultType('emails');
 		$remoteType = new SearchResultType('remotes');
 
-		if (!isset($allResults[$remoteType->getLabel()])
-			|| !isset($allResults[$emailType->getLabel()])) {
+		$emailLabel = $emailType->getLabel();
+		$emailEntries = array_merge(
+			$allResults['exact'][$emailLabel] ?? [],
+			$allResults[$emailLabel] ?? []
+		);
+		if ($emailEntries === []) {
 			return;
 		}
 
 		$mailIdMap = [];
-		foreach ($allResults[$emailType->getLabel()] as $mailRow) {
+		foreach ($emailEntries as $mailRow) {
 			// sure, array_reduce looks nicer, but foreach needs less resources and is faster
 			if (!isset($mailRow['uuid'])) {
 				continue;
@@ -120,5 +124,17 @@ protected function dropMailSharesWhereRemoteShareIsPossible(ISearchResult $searc
 				$searchResult->removeCollaboratorResult($emailType, $mailIdMap[$resultRow['uuid']]);
 			}
 		}
+		$lookupType = new SearchResultType('lookup');
+		if (isset($allResults[$lookupType->getLabel()])) {
+			foreach ($allResults[$lookupType->getLabel()] as $resultRow) {
+				$userid = $resultRow['extra']['userid']['value'] ?? null;
+				if ($userid === null) {
+					continue;
+				}
+				if (isset($mailIdMap[$userid])) {
+					$searchResult->removeCollaboratorResult($emailType, $mailIdMap[$userid]);
+				}
+			}
+		}
 	}
 }