Fix calendar emails to be outlook compatible #12946
Conversation
|
ref #12885 - nicely done with lots of comments, hartelijk dank @hdijkema ! Now let's see if @georgehrke can review... |
|
supersedes #12921 |
|
cc @nickvergessen regarding the changes to Mailer |
|
Can you please cover your changes with Unit tests? Thx! :) |
Where can I find the current unit tests? |
|
Sorry to interrupt. Is it possible that this patch is related to the timezone issue you are describing? sabre-io/vobject#412 |
This fix in Sabre solves the DTSTART / DTEND TZID problem for Outlook 2016 and 2010. I hope it will be part of nextcloud soon. So we can leave out the timezone fix in IMipPlugin.php. |
Signed-off-by: hdijkema <hans@dykema.nl>
…ud/3rdparty#191. Signed-off-by: hdijkema <hans@dykema.nl>
Co-Authored-By: hdijkema <hans@dykema.nl> Signed-off-by: hdijkema <hans@dykema.nl>
Co-Authored-By: hdijkema <hans@dykema.nl> Signed-off-by: hdijkema <hans@dykema.nl>
Co-Authored-By: hdijkema <hans@dykema.nl> Signed-off-by: hdijkema <hans@dykema.nl>
Co-Authored-By: hdijkema <hans@dykema.nl> Signed-off-by: hdijkema <hans@dykema.nl>
Signed-off-by: hdijkema <hans@dykema.nl>
| * @return $this | ||
| * @since 16.0.0 | ||
| */ | ||
| public function addPart($data, $content_type = null, $charset = null): IMessage { |
There was a problem hiding this comment.
The method here works different than addPart https://github.com/nextcloud/3rdparty/blob/da8e24b48079cec2f9c8be950f7b996bce172190/swiftmailer/swiftmailer/lib/classes/Swift/Message.php#L72 (from swiftmailer). I would prefer another name than because addPart from swiftmailer add a part with the current encoder while these method always uses 8bit encoder. I would add getEncoder and setEncoder and set the encoding from IMipPlugin but lets ask @nickvergessen first.
nickvergessen
changed the title
|
There seems to be no record for the failure: https://drone.nextcloud.com/nextcloud/server/14710 results in a 404. See below? |
|
Builds logs are deleted after some time to save space. Rebase the branch to trigger CI again. |
| # encoder with an 8bit encoder and after we've finished, we reset the encoder | ||
| # to the previous one. | ||
| $encoder = $this->swiftMessage->getEncoder(); | ||
| $eightbit_encoder = new \Swift_Mime_ContentEncoder_PlainContentEncoder("8bit"); |
There was a problem hiding this comment.
| $eightbit_encoder = new \Swift_Mime_ContentEncoder_PlainContentEncoder("8bit"); | |
| $eightbitEncoder = new \Swift_Mime_ContentEncoder_PlainContentEncoder('8bit'); |
| # to the previous one. | ||
| $encoder = $this->swiftMessage->getEncoder(); | ||
| $eightbit_encoder = new \Swift_Mime_ContentEncoder_PlainContentEncoder("8bit"); | ||
| $this->swiftMessage->setEncoder($eightbit_encoder); |
There was a problem hiding this comment.
| $this->swiftMessage->setEncoder($eightbit_encoder); | |
| $this->swiftMessage->setEncoder($eightbitEncoder); |
| * @return $this | ||
| * @since 16.0.0 | ||
| */ | ||
| public function addPart($data, $content_type = null, $charset = null): IMessage { |
There was a problem hiding this comment.
| public function addPart($data, $content_type = null, $charset = null): IMessage { | |
| public function addPart($data, $contentType = null, $charset = null): IMessage { |
| $encoder = $this->swiftMessage->getEncoder(); | ||
| $eightbit_encoder = new \Swift_Mime_ContentEncoder_PlainContentEncoder("8bit"); | ||
| $this->swiftMessage->setEncoder($eightbit_encoder); | ||
| $this->swiftMessage->addPart($data, $content_type, $charset); |
There was a problem hiding this comment.
| $this->swiftMessage->addPart($data, $content_type, $charset); | |
| $this->swiftMessage->addPart($data, $contentType, $charset); |
|
@hdijkema 🏓 :) |
? |
|
There are pending changes from the review and
Could you look into that? Cheers |
I'm sorry, I'm lost here. Don't know what to do. I moved back to owncloud after problems with nextcloud and have not been back to nextcloud again the last year. I prepared this patch about 2 years ago, because back then I wanted nextcloud to send proper invites for calendar items. Got it working; next thing I find was this mergerequest stuck on integration checks that I don't understand. It also was stuck on waiting for a new release of the underlying calendar library (forgot it's name). Maybe you can just review what I've done and put the right changes in the NextCloud tree yourself? |
|
Ok, then I'll close it and anyone who would like to continue this work can just restore the branch and do the rest. |
Signed-off-by: merlinwoff <merlin.woff@gmail.com>
Signed-off-by: hdijkema hans@dykema.nl