fix(caldav): Expand recurring events for principal calendar search#60766
Open
kesselb wants to merge 3 commits into
Open
fix(caldav): Expand recurring events for principal calendar search#60766kesselb wants to merge 3 commits into
kesselb wants to merge 3 commits into
Conversation
kesselb
requested review from
ChristophWurst,
SebastianKrupinski and
tcitworld
as code owners
May 27, 2026 10:26
kesselb
requested review from
CarlSchwan,
artonge,
leftybournes and
salmart-dev
and removed request for
a team
May 27, 2026 10:26
Contributor
Author
|
/backport to stable34 |
Contributor
Author
|
/backport to stable33 |
Contributor
Author
|
/backport to stable32 |
SebastianKrupinski
previously approved these changes
May 27, 2026
Contributor
|
I approved by mistake! It was meant to be a comment! |
kesselb
force-pushed
the
bug/noid/expand-unified-search
branch
from
June 9, 2026 22:29
5c8045f to
cf432ac
Compare
Member
|
FYI found a potentially matching ticket for this fix: #52979 |
kesselb
force-pushed
the
bug/noid/expand-unified-search
branch
3 times, most recently
from
June 16, 2026 15:47
4198ce9 to
3512232
Compare
kesselb
force-pushed
the
bug/noid/expand-unified-search
branch
from
June 21, 2026 21:15
3512232 to
d66fe27
Compare
Contributor
Author
|
@SebastianKrupinski @ChristophWurst ready for review ;) |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 3 comments.
Comments suppressed due to low confidence (1)
apps/dav/lib/Search/TasksSearchProvider.php:130
- The result loop can now skip rows (non-calendar data / missing component). Using
count($formattedResults)to advance the cursor can stall pagination (e.g. repeatedly re-fetching the same invalid rows). Advance the cursor independently of how many entries you returned (typically by the requested limit).
return SearchResult::paginated(
$this->getName(),
$formattedResults,
$query->getCursor() + count($formattedResults)
);
SebastianKrupinski
approved these changes
Jun 22, 2026
kesselb
force-pushed
the
bug/noid/expand-unified-search
branch
from
July 1, 2026 10:00
d66fe27 to
3cbe078
Compare
kesselb
added
3. to review
Assisted-by: Claude:claude-sonnet-4-6 Assisted-by: Claude:claude-sonnet-5 Assisted-by: OpenCode:github-copilot/gpt-5.4 Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb
force-pushed
the
bug/noid/expand-unified-search
branch
from
July 21, 2026 15:37
3cbe078 to
c45ba8d
Compare
Comment on lines
139
to
143
| if ($personDisplayName !== null) { | ||
| $attendeeSearchResults = $this->backend->searchPrincipalUri( | ||
| array_push($searchResults, ...$this->backend->searchPrincipalUri( | ||
| $principalUri, | ||
| $personDisplayName, | ||
| [self::COMPONENT_TYPE], |
Comment on lines
+110
to
+112
| if ($since !== null && $until === null) { | ||
| $until = new DateTimeImmutable('now', new \DateTimeZone('Z')); | ||
| } |
7 tasks
DerDreschner
approved these changes
Jul 22, 2026
DerDreschner
left a comment
DerDreschner
left a comment
Contributor
There was a problem hiding this comment.
Tested successfully
ChristophWurst
added
4. to release
CarlSchwan
removed their request for review
July 22, 2026 15:50
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Expand recurring events when searching for events through unified search.
STR:
Main: Event 2024-05-26 is shown
Here: Event 2026-05-26 is shown
Checklist
3. to review, feature component)stable32)AI (if applicable)