Skip to content

fix(imip): dont compare events for the reply message - #51131

Merged
hamza221 merged 1 commit into
masterfrom
fix/reply-message
Jun 5, 2025
Merged

fix(imip): dont compare events for the reply message#51131
hamza221 merged 1 commit into
masterfrom
fix/reply-message

Conversation

@hamza221

@hamza221hamza221 commented Feb 28, 2025

Copy link
Copy Markdown
Contributor

Summary

TODO

  • ...

Checklist

@hamza221hamza221 added bug 3. to review Waiting for reviews feature: dav feature: caldav Related to CalDAV internals labels Feb 28, 2025
@hamza221hamza221 self-assigned this Feb 28, 2025
case self::METHOD_REPLY:
$method = self::METHOD_REPLY;
$data = $this->imipService->buildBodyData($vEvent, $oldVevent);
$organizerEvent = $this->imipService->getOrganizerVEvent($vEvent->uid, $iTipMessage->recipient);

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.

Hey, you can't just pull the event by the recipient, This will fail, for external organizers

@susnuxsusnux added this to the Nextcloud 32 milestone Mar 2, 2025
@hamza221

Copy link
Copy Markdown
ContributorAuthor

@SebastianKrupinski would it make sense to keep this even that it only works if the organiser is a local user?
I mean check if he is and search for the event. Sent potentially wrong message in the other case? Would be better than nothing no ?

@SebastianKrupinski

Copy link
Copy Markdown
Contributor

@SebastianKrupinski would it make sense to keep this even that it only works if the organiser is a local user? I mean check if he is and search for the event. Sent potentially wrong message in the other case? Would be better than nothing no ?

I don't think having different code paths for internal and external attendees is a good idea, just makes it too complex, the only thing I would keep is the separate method for the reply message, as the reply does not need event comparison, and all the extra information that is normally generate

@hamza221
hamza221 marked this pull request as draft March 3, 2025 13:52
@hamza221
hamza221force-pushed the fix/reply-message branch 2 times, most recently from 2e9dfc5 to d949ccaCompareMarch 26, 2025 14:06
@hamza221
hamza221 marked this pull request as ready for review March 26, 2025 14:07
@hamza221hamza221 changed the title fix(imip): dont propagate attendee changes in reply messagefix(imip): dont compare events for the reply messageMar 26, 2025
Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
@hamza221
hamza221 enabled auto-merge June 5, 2025 10:31

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

Tested and works.

@st3inyst3iny added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 5, 2025
@st3iny

Copy link
Copy Markdown
Member

/backport to stable30

@st3iny

Copy link
Copy Markdown
Member

/backport to stable31

@hamza221
hamza221 merged commit d6a53ce into masterJun 5, 2025
@hamza221
hamza221 deleted the fix/reply-message branch June 5, 2025 12:14
@backportbot

Copy link
Copy Markdown

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31
# Create the new backport branch
git checkout -b backport/51131/stable31
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts, resolve them
git cherry-pick ed1bfe70
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/51131/stable31

Error: Failed to push branch backport/51131/stable31: remote: Invalid username or password.
fatal: Authentication failed for 'https://github.com/nextcloud/server.git/'


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@st3iny

Copy link
Copy Markdown
Member

/backport to stable31

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

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: caldavRelated to CalDAV internalsfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Changes by attendee propagating to organiser

5 participants

@hamza221@SebastianKrupinski@st3iny@susnux@skjnldsv