Merge pull request #46464 from nextcloud/unified-search-enhancements

Unified search: add attributes for clients
nextcloud · Jul 25, 2024 · c9da3da · c9da3da
2 parents 9ed6d1e + 63d5c2b
commit c9da3da
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -111,7 +111,12 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 			$subline = $this->generateSubline($vCard);
 			$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
@@ -17,6 +17,7 @@
 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 @@ public function search(
 				$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(