From 269df904a372d747cd1beb1c5bfa282fc3900799 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 11 Nov 2022 09:44:24 +0100 Subject: [PATCH] Improve email search results Signed-off-by: Joas Schilling --- lib/private/Collaboration/Collaborators/MailPlugin.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php index d34d9fb0087..aa317ec1720 100644 --- a/lib/private/Collaboration/Collaborators/MailPlugin.php +++ b/lib/private/Collaboration/Collaborators/MailPlugin.php @@ -101,6 +101,12 @@ class MailPlugin implements ISearchPlugin { return false; } + // Extract the email address from "Foo Bar " 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' => []];