Skip to content

fix(dav): drop redundant “event” word so merged CalDAV activities read correctly - #65236

Open
whoalin1 wants to merge 1 commit into
nextcloud:masterfrom
whoalin1:fix/caldav-activity-event-merge-wording
Open

whoalin1 wants to merge 1 commit into
nextcloud:masterfrom
whoalin1:fix/caldav-activity-event-merge-wording

Conversation

@whoalin1

@whoalin1 whoalin1 commented Oct 6, 2026 •

Copy link
Copy Markdown

Summary

Fix CalDAV activity wording when multiple events are merged into one activity entry.

Subjects used a literal word “event” before the {event} placeholder (You created event {event}…). After EventMerger expands {event} to {event1} and {event2}, that read as “You created event A and B…”.

Align with the files activity pattern (You created {file}) so the placeholder is the event name(s). Merged activities then read naturally: “You created A and B in calendar …”.

Closes #5528

Test plan

  • Create several calendar events in a short window; activity stream shows one merged line without the singular “event” before the names
  • Single-event create/update/delete/move/restore subjects still make sense (e.g. “You created Lunch in calendar Work”)
  • Actor (non-self) variants still parse
  • No PHP syntax issues in Event.php

AI disclosure

This PR was drafted with the help of AI coding assistants (Cursor agents / LLM-based tools), including the description. I am responsible for it and happy to rework anything that doesn't fit.

All commits carry an Assisted-by: Cursor:grok-4.7 trailer.

@whoalin1
whoalin1 force-pushed the fix/caldav-activity-event-merge-wording branch from 00226fe to e422c7e Compare October 9, 2026 14:11

@SebastianKrupinski SebastianKrupinski left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking until design approves

@SebastianKrupinski

Copy link
Copy Markdown
Contributor

@kra-mo thoughts?

@github-actions

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@whoalin1

Copy link
Copy Markdown
Author

Looked at the failing checks (check-ai-trailers, gate, merge-reports, playwright-test-summary): same pattern as on other PRs in this repo right now — gate deliberately fails for PRs without the 3. to review/4. to release/force-e2e-tests labels or playwright path changes (by design, to skip the Playwright matrix), merge-reports/playwright-test-summary then fail because the Playwright artifact/cache they depend on was never created, and check-ai-trailers fails on a 403 when it tries to add the "AI assisted" label (fork PR GITHUB_TOKEN is read-only for issues/labels). None of these are caused by this PR's diff — all the real test/lint/static-analysis checks pass.

@SebastianKrupinski noted, I won't push further changes here until the design question to @kra-mo is resolved — not making any assumptions about the wording decision. Happy to adjust the strings once there's guidance.

@kra-mo kra-mo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

…correctly

Assisted-by: Cursor:grok-4.7
Signed-off-by: whoalin1 <whoalin414@gmail.com>
@SebastianKrupinski
SebastianKrupinski force-pushed the fix/caldav-activity-event-merge-wording branch from e422c7e to 625ac39 Compare November 2, 2026 13:46
@SebastianKrupinski

Copy link
Copy Markdown
Contributor

@whoalin1

Can you please put back the original PR template and fill it out properly

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Plural missing on CalDAV Activity when creating multiple Calendar events

3 participants