diff options
| author | tobiasKaminsky <tobias@kaminsky.me> | 2024-07-12 09:18:16 +0200 |
|---|---|---|
| committer | Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com> | 2024-07-25 15:42:09 +0200 |
| commit | 63d5c2b0e01637bc8253afecf09399fe2d727c51 (patch) | |
| tree | f2c2a283d488fac9ce8219707aba0b986e7e78c6 /apps/dav/lib/Search | |
| parent | 9ed6d1eb9ad300ac20a8854986988e2ffd9e7625 (diff) | |
| download | nextcloud-server-63d5c2b0e01637bc8253afecf09399fe2d727c51.tar.gz nextcloud-server-63d5c2b0e01637bc8253afecf09399fe2d727c51.zip | |
fix: https://github.com/nextcloud/calendar/issues/6079 and https://github.com/nextcloud/contacts/issues/3997
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Diffstat (limited to 'apps/dav/lib/Search')
| -rw-r--r-- | apps/dav/lib/Search/ContactsSearchProvider.php | 7 | ||||
| -rw-r--r-- | apps/dav/lib/Search/EventsSearchProvider.php | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php index e2284c64e51..b0f6f1a044c 100644 --- a/apps/dav/lib/Search/ContactsSearchProvider.php +++ b/apps/dav/lib/Search/ContactsSearchProvider.php @@ -111,7 +111,12 @@ class ContactsSearchProvider implements IFilteringProvider { $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 index d45fd638e80..6c9fe5167c5 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( |