upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

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

Browse source 
Unified search: add attributes for clients
This commit is contained in:
Tobias Kaminsky 2024-07-25 16:39:33 +02:00 committed by GitHub
commit c9da3daf7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/dav/lib/Search/ContactsSearchProvider.php
View file

@ -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(

11
apps/dav/lib/Search/EventsSearchProvider.php
View file

@ -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(