sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: link upcoming event to calendar app modal 

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
pull/53286/head
Maksim Sukharev 2025-06-02 22:20:41 +07:00 committed by backportbot[bot]
parent dfcac1057b
commit 90f95d46f5
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
apps/dav/lib/CalDAV/UpcomingEventsService.php
Unescape Escape View File

@ -47,20 +47,36 @@ class UpcomingEventsService {
$this->userManager->get($userId),
);
return array_map(fn (array $event) => new UpcomingEvent(
$event['uri'],
($event['objects'][0]['RECURRENCE-ID'][0] ?? null)?->getTimeStamp(),
$event['calendar-uri'],
$event['objects'][0]['DTSTART'][0]?->getTimestamp(),
$event['objects'][0]['SUMMARY'][0] ?? null,
$event['objects'][0]['LOCATION'][0] ?? null,
match ($calendarAppEnabled) {
// TODO: create a named, deep route in calendar
// TODO: it's a code smell to just assume this route exists, find an abstraction
true => $this->urlGenerator->linkToRouteAbsolute('calendar.view.index'),
false => null,
},
), $events);
return array_map(function (array $event) use ($userId, $calendarAppEnabled) {
$calendarAppUrl = null;
if ($calendarAppEnabled) {
$arguments = [
'objectId' => base64_encode($this->urlGenerator->getWebroot() . '/remote.php/dav/calendars/' . $userId . '/' . $event['calendar-uri'] . '/' . $event['uri']),
];
if (isset($event['RECURRENCE-ID'])) {
$arguments['recurrenceId'] = $event['RECURRENCE-ID'][0];
}
/**
* TODO: create a named, deep route in calendar (it's a code smell to just assume this route exists, find an abstraction)
* When changing, also adjust for:
* - spreed/lib/Service/CalendarIntegrationService.php#getDashboardEvents
* - spreed/lib/Service/CalendarIntegrationService.php#getMutualEvents
*/
$calendarAppUrl = $this->urlGenerator->linkToRouteAbsolute('calendar.view.indexdirect.edit', $arguments);
}
return new UpcomingEvent(
$event['uri'],
($event['objects'][0]['RECURRENCE-ID'][0] ?? null)?->getTimeStamp(),
$event['calendar-uri'],
$event['objects'][0]['DTSTART'][0]?->getTimestamp(),
$event['objects'][0]['SUMMARY'][0] ?? null,
$event['objects'][0]['LOCATION'][0] ?? null,
$calendarAppUrl,
);
}, $events);
}
}