Improve email search results

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Dec 3, 2022 · 85ae0c7 · 85ae0c7
1 parent a39e6fb
commit 85ae0c7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -101,6 +101,12 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 			return false;
 		}
 
+		// Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
+		$result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
+		if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
+			return $this->search($matches[1], $limit, $offset, $searchResult);
+		}
+
 		$currentUserId = $this->userSession->getUser()->getUID();
 
 		$result = $userResults = ['wide' => [], 'exact' => []];