Skip to content

feat(talk): record the conversation as the event's conference - #8951

Merged
SebastianKrupinski merged 1 commit into
nextcloud:mainfrom
Rikdekker:feat/hybrid-meeting-toggles
Sep 25, 2026
Merged

SebastianKrupinski merged 1 commit into
nextcloud:mainfrom
Rikdekker:feat/hybrid-meeting-toggles

Conversation

@Rikdekker

Copy link
Copy Markdown
Contributor

A Talk link was only stored in LOCATION, or appended to DESCRIPTION when LOCATION already held something. Neither says "this is where the meeting happens online", and for a hybrid meeting LOCATION is needed for the room the event takes place in.

Write the conversation to CONFERENCE (RFC 7986), which is the property meant for a virtual meeting URL. An earlier conversation is replaced rather than stacked, so an event keeps a single conference.

Talk currently only finds events whose call link is in LOCATION, so CONFERENCE alone would make a hybrid meeting invisible there. That is why the existing LOCATION/DESCRIPTION behaviour stays as it is — clients that do not read CONFERENCE keep working exactly as before. nextcloud/spreed#19472 adds the DESCRIPTION side in Talk.

Tested with the resulting calendar objects on Nextcloud 35.0.0 (Calendar 6.6.0-rc.2, Talk 25.0.0), with nextcloud/spreed#19472 applied: a meeting with a room in LOCATION and a conversation is found by Talk, and so is an online-only meeting. The replace-not-stack behaviour was verified against @nextcloud/calendar-js directly.

🤖 AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@codecov

codecov Bot commented Sep 19, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@tcitworld

Copy link
Copy Markdown
Member

Reference: #1758

@SebastianKrupinski
SebastianKrupinski force-pushed the feat/hybrid-meeting-toggles branch from 4478871 to 95b0e26 Compare September 25, 2026 12:14

@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.

Looks good

image

Assisted-by: Claude:claude-opus-5
Signed-off-by: Rikdekker <Rikdekker@users.noreply.github.com>
@SebastianKrupinski
SebastianKrupinski force-pushed the feat/hybrid-meeting-toggles branch from 95b0e26 to 1f269df Compare September 25, 2026 12:30
@SebastianKrupinski SebastianKrupinski added 3. to review Waiting for reviews 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 25, 2026
@SebastianKrupinski SebastianKrupinski added this to the v6.7 milestone Sep 25, 2026
@SebastianKrupinski
SebastianKrupinski merged commit 6f99725 into nextcloud:main Sep 25, 2026
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants