Skip to content

feat: link upcoming event to calendar app modal #53274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Jun 3, 2025
Merged

feat: link upcoming event to calendar app modal #53274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feat: link upcoming event to calendar app modal 
Signed-off-by: Maksim Sukharev <[email protected]>
  • Loading branch information
@Antreesy
Antreesy committed Jun 3, 2025
commit e2265ff2457fa54d1e4bbdb16f71969e470e36ee
44 changes: 30 additions & 14 deletions apps/dav/lib/CalDAV/UpcomingEventsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,36 @@ public function getEvents(string $userId, ?string $location = null): array {
$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);
}

}
Loading