Skip to content

fix(ICalendar): allow to search for event URI #59142

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

Open
mejo- wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −0
Open

fix(ICalendar): allow to search for event URI #59142

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,6 +2062,10 @@ public function search(
$outerQuery->andWhere($outerQuery->expr()->eq('uid', $outerQuery->createNamedParameter($options['uid'])));
}

if (isset($options['uri'])) {
$outerQuery->andWhere($outerQuery->expr()->eq('uri', $outerQuery->createNamedParameter($options['uri'])));
}

if (!empty($options['types'])) {
$or = [];
foreach ($options['types'] as $type) {
Expand Down
2 changes: 2 additions & 0 deletions lib/public/Calendar/ICalendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* @psalm-type CalendarSearchOptions = array{
* timerange?: array{start?: DateTimeInterface, end?: DateTimeInterface},
* uid?: string,
* uri?: string,
* types?: string[],
* }
*/
Expand Down Expand Up @@ -60,6 +61,7 @@ public function getDisplayColor(): ?string;
* @param array $options Optional parameters for the search:
* - 'timerange' element that can have 'start' (DateTimeInterface), 'end' (DateTimeInterface), or both.
* - 'uid' element to look for events with a given uid.
* - 'uri' element to look for events with a given uri.
* - 'types' element to only return events for a given type (e.g. VEVENT or VTODO)
* @psalm-param CalendarSearchOptions $options
* @param int|null $limit Limit the number of search results.
Expand Down
Loading