From a6d76de9e6fc0d5dd0249b119a24d2bc5876258a Mon Sep 17 00:00:00 2001 From: Bennet Becker Date: Mon, 26 Dec 2022 23:48:00 +0100 Subject: [PATCH] setting Auto-Submitted for notification mails uses method from nextcloud/server#35876 if it exists, falling back setting it via the swift message Signed-off-by: Bennet Becker --- lib/MailQueueHandler.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/MailQueueHandler.php b/lib/MailQueueHandler.php index 3480b9b44..5d11c9bda 100644 --- a/lib/MailQueueHandler.php +++ b/lib/MailQueueHandler.php @@ -35,7 +35,7 @@ use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; -use OCP\L10N\IFactory; +use OCP\L10N\IFactory; use OCP\Mail\IMailer; use OCP\RichObjectStrings\InvalidObjectExeption; use OCP\RichObjectStrings\IValidator; @@ -411,6 +411,12 @@ protected function sendEmailToUser($userName, $email, $lang, $timezone, $maxTime $message->useTemplate($template); $message->setFrom([$this->getSenderData('email') => $this->getSenderData('name')]); + if(method_exists($message, 'setAutoSubmitted')){ + $message->setAutoSubmitted(\OCP\Mail\AutoSubmittedValue::AUTO_GENERATED); + } else { + $message->getSwiftMessage()->getHeaders()->addTextHeader('Auto-Submitted', 'auto-generated'); + } + try { $this->mailer->send($message); } catch (\Exception $e) {