4 files changed, 28 insertions, 28 deletions

diff --git a/apps/dav/lib/Search/ACalendarSearchProvider.php b/apps/dav/lib/Search/ACalendarSearchProvider.php
index d0c164822a4..331d05cb500 100644
--- a/apps/dav/lib/Search/ACalendarSearchProvider.php
+++ b/apps/dav/lib/Search/ACalendarSearchProvider.php
@@ -23,18 +23,6 @@ use Sabre\VObject\Reader;
  */
 abstract class ACalendarSearchProvider implements IProvider {
 
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IL10N */
-	protected $l10n;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var CalDavBackend */
-	protected $backend;
-
 	/**
 	 * ACalendarSearchProvider constructor.
 	 *
@@ -43,14 +31,12 @@ abstract class ACalendarSearchProvider implements IProvider {
 	 * @param IURLGenerator $urlGenerator
 	 * @param CalDavBackend $backend
 	 */
-	public function __construct(IAppManager $appManager,
-		IL10N $l10n,
-		IURLGenerator $urlGenerator,
-		CalDavBackend $backend) {
-		$this->appManager = $appManager;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->backend = $backend;
+	public function __construct(
+		protected IAppManager $appManager,
+		protected IL10N $l10n,
+		protected IURLGenerator $urlGenerator,
+		protected CalDavBackend $backend,
+	) {
 	}
 
 	/**
@@ -64,7 +50,7 @@ abstract class ACalendarSearchProvider implements IProvider {
 		$calendars = $this->backend->getCalendarsForUser($principalUri);
 		$calendarsById = [];
 		foreach ($calendars as $calendar) {
-			$calendarsById[(int) $calendar['id']] = $calendar;
+			$calendarsById[(int)$calendar['id']] = $calendar;
 		}
 
 		return $calendarsById;
@@ -81,7 +67,7 @@ abstract class ACalendarSearchProvider implements IProvider {
 		$subscriptions = $this->backend->getSubscriptionsForUser($principalUri);
 		$subscriptionsById = [];
 		foreach ($subscriptions as $subscription) {
-			$subscriptionsById[(int) $subscription['id']] = $subscription;
+			$subscriptionsById[(int)$subscription['id']] = $subscription;
 		}
 
 		return $subscriptionsById;
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
index e2284c64e51..158c0d0813e 100644
--- a/apps/dav/lib/Search/ContactsSearchProvider.php
+++ b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -81,7 +81,7 @@ class ContactsSearchProvider implements IFilteringProvider {
 		$addressBooks = $this->backend->getAddressBooksForUser($principalUri);
 		$addressBooksById = [];
 		foreach ($addressBooks as $addressBook) {
-			$addressBooksById[(int) $addressBook['id']] = $addressBook;
+			$addressBooksById[(int)$addressBook['id']] = $addressBook;
 		}
 
 		$searchResults = $this->backend->searchPrincipalUri(
@@ -109,9 +109,14 @@ class ContactsSearchProvider implements IFilteringProvider {
 
 			$title = (string)$vCard->FN;
 			$subline = $this->generateSubline($vCard);
-			$resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
+			$resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string)$vCard->UID);
 
-			return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
+			$result = new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
+			$result->addAttribute('displayName', $title);
+			$result->addAttribute('email', $subline);
+			$result->addAttribute('phoneNumber', (string)$vCard->TEL);
+
+			return $result;
 		}, $searchResults);
 
 		return SearchResult::paginated(
diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php
index d45fd638e80..55fba40918a 100644
--- a/apps/dav/lib/Search/EventsSearchProvider.php
+++ b/apps/dav/lib/Search/EventsSearchProvider.php
@@ -17,6 +17,7 @@ use OCP\Search\SearchResultEntry;
 use Sabre\VObject\Component;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\Property;
+use Sabre\VObject\Property\ICalendar\DateTime;
 use function array_combine;
 use function array_fill;
 use function array_key_exists;
@@ -157,8 +158,16 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
 				$calendar = $subscriptionsById[$eventRow['calendarid']];
 			}
 			$resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
+			$result = new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
 
-			return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
+			$dtStart = $component->DTSTART;
+
+			if ($dtStart instanceof DateTime) {
+				$startDateTime = $dtStart->getDateTime()->format('U');
+				$result->addAttribute('createdAt', $startDateTime);
+			}
+
+			return $result;
 		}, $searchResults);
 
 		return SearchResult::paginated(
@@ -185,7 +194,7 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
 	protected function getDavUrlForCalendarObject(
 		string $principalUri,
 		string $calendarUri,
-		string $calendarObjectUri
+		string $calendarObjectUri,
 	): string {
 		[,, $principalId] = explode('/', $principalUri, 3);
 
diff --git a/apps/dav/lib/Search/TasksSearchProvider.php b/apps/dav/lib/Search/TasksSearchProvider.php
index 176e758fd2b..15baf070e81 100644
--- a/apps/dav/lib/Search/TasksSearchProvider.php
+++ b/apps/dav/lib/Search/TasksSearchProvider.php
@@ -121,7 +121,7 @@ class TasksSearchProvider extends ACalendarSearchProvider {
 	): string {
 		return $this->urlGenerator->getAbsoluteURL(
 			$this->urlGenerator->linkToRoute('tasks.page.index')
-			. '#/calendars/'
+			. 'calendars/'
 			. $calendarUri
 			. '/tasks/'
 			. $taskUri