Include more information in iMIP email and show diff information on updating an event #35743
Conversation
miaulalala
requested review from
ChristophWurst and
tcitworld
as code owners
miaulalala
added
2. developing
|
/backport to stable25 |
|
/backport to stable24 |
|
/backport to stable23 |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
ChristophWurst
added
3. to review
|
unfortunately, the approach with just the reccurence-id doesn't work correctly if I first update a single recurrence and then the whole instance. |
miaulalala
added
2. developing
| @@ -131,6 +140,51 @@ | |||
| $this->userManager = $userManager; | |||
| } | |||
|
|
|||
| public function initialize(DAV\Server $server) { | |||
Check notice
Code scanning / Psalm
MissingReturnType
| * @param resource $data data | ||
| * @param bool $modified modified | ||
| */ | ||
| public function beforeWriteContent($uri, INode $node, $data, $modified) { |
Check notice
Code scanning / Psalm
MissingReturnType
miaulalala
changed the title
VEVENT to build iMip email
| // No changed events after all - this shouldn't happen if there is significant change yet here we are | ||
| // The scheduling status is debatable | ||
| // @todo handle this error case | ||
| if(!is_array($newEventComponents) || empty($newEventComponents)) { |
Check notice
Code scanning / Psalm
DocblockTypeContradiction
There was a problem hiding this comment.
Psalm found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.
|
I had a look, it's not in there yet. Will have to be a followup ticket due to time constraints this week. Sorry @onny |
miaulalala
force-pushed
the
fix/use-recurrence-for-imip-email
branch
from
a39a850
to
ca4728c
Compare
miaulalala
force-pushed
the
fix/use-recurrence-for-imip-email
branch
2 times, most recently
from
d5fd00b
to
37e1141
Compare
instead of the main VEVENT of a repeating event Fixes part of nextcloud/calendar#3919 Signed-off-by: Anna Larch <anna@nextcloud.com>
miaulalala
force-pushed
the
fix/use-recurrence-for-imip-email
branch
from
37e1141
to
38e9cb6
Compare
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable23 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable23
git pull origin/stable23
# Create the new backport branch
git checkout -b fix/foo-stable23
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport to stable25 |
|
/backport to stable24 |
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable23 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable23
git pull origin/stable23
# Create the new backport branch
git checkout -b fix/foo-stable23
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport to stable25 |
|
/backport to stable24 |
Summary
Instead of taking the date and time of the main recurrence, the changed VEVENT is filtered from the main VCALENDAR event and used to build a diff to accurately represent what changed.
Screenshots to follow
To Do
As discussed with @ChristophWurst:
Testing manually
All events must have at least one attendee to trigger the iMIP logic
Checklist