fix: add ability to send alternet text (html and plain)

Signed-off-by: SebastianKrupinski <[email protected]>

appinfo/info.xml

@@ -34,7 +34,7 @@ The rating depends on the installed text processing backend. See [the rating ove
 
 Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).
 	]]></description>
-	<version>4.2.0-alpha.0</version>
+	<version>4.2.2-alpha.0</version>
 	<licence>agpl</licence>
 	<author homepage="https://github.com/ChristophWurst">Christoph Wurst</author>
 	<author homepage="https://github.com/GretaD">GretaD</author>

lib/Controller/DraftsController.php

@@ -101,9 +101,16 @@ public function create(
 		$message->setAccountId($accountId);
 		$message->setAliasId($aliasId);
 		$message->setSubject($subject);
-		$message->setBody($body);
+		if ($isHtml) {
+			$message->setBodyPlain(null);
+			$message->setBodyHtml($body);
+			$message->setHtml(true);
+		} else {
+			$message->setBodyPlain($body);
+			$message->setBodyHtml(null);
+			$message->setHtml(false);
+		}
 		$message->setEditorBody($editorBody);
-		$message->setHtml($isHtml);
 		$message->setInReplyToMessageId($inReplyToMessageId);
 		$message->setUpdatedAt($this->timeFactory->getTime());
 		$message->setSendAt($sendAt);
@@ -169,9 +176,16 @@ public function update(int $id,
 		$message->setAccountId($accountId);
 		$message->setAliasId($aliasId);
 		$message->setSubject($subject);
-		$message->setBody($body);
+		if ($isHtml) {
+			$message->setBodyPlain(null);
+			$message->setBodyHtml($body);
+			$message->setHtml(true);
+		} else {
+			$message->setBodyPlain($body);
+			$message->setBodyHtml(null);
+			$message->setHtml(false);
+		}
 		$message->setEditorBody($editorBody);
-		$message->setHtml($isHtml);
 		$message->setFailed($failed);
 		$message->setInReplyToMessageId($inReplyToMessageId);
 		$message->setSendAt($sendAt);

lib/Controller/OutboxController.php

@@ -118,9 +118,16 @@ public function create(
 		$message->setAccountId($accountId);
 		$message->setAliasId($aliasId);
 		$message->setSubject($subject);
-		$message->setBody($body);
+		if ($isHtml) {
+			$message->setBodyPlain(null);
+			$message->setBodyHtml($body);
+			$message->setHtml(true);
+		} else {
+			$message->setBodyPlain($body);
+			$message->setBodyHtml(null);
+			$message->setHtml(false);
+		}
 		$message->setEditorBody($editorBody);
-		$message->setHtml($isHtml);
 		$message->setInReplyToMessageId($inReplyToMessageId);
 		$message->setSendAt($sendAt);
 		$message->setPgpMime($isPgpMime);
@@ -181,7 +188,8 @@ public function update(
 		int $id,
 		int $accountId,
 		string $subject,
-		string $body,
+		?string $bodyPlain,
+		?string $bodyHtml,
 		?string $editorBody,
 		bool $isHtml,
 		bool $smimeSign,
@@ -207,9 +215,10 @@ public function update(
 		$message->setAccountId($accountId);
 		$message->setAliasId($aliasId);
 		$message->setSubject($subject);
-		$message->setBody($body);
-		$message->setEditorBody($editorBody);
+		$message->setBodyPlain($bodyPlain);
+		$message->setBodyHtml($bodyHtml);
 		$message->setHtml($isHtml);
+		$message->setEditorBody($editorBody);
 		$message->setInReplyToMessageId($inReplyToMessageId);
 		$message->setSendAt($sendAt);
 		$message->setPgpMime($isPgpMime);

lib/Db/LocalMessage.php

@@ -25,8 +25,10 @@
  * @method void setSendAt(?int $sendAt)
  * @method string getSubject()
  * @method void setSubject(string $subject)
- * @method string getBody()
- * @method void setBody(?string $body)
+ * @method string getBodyPlain()
+ * @method void setBodyPlain(?string $bodyPlain)
+ * @method string getBodyHtml()
+ * @method void setBodyHtml(?string $bodyHtml)
  * @method string|null getEditorBody()
  * @method void setEditorBody(string $body)
  * @method bool isHtml()
@@ -88,8 +90,11 @@ class LocalMessage extends Entity implements JsonSerializable {
 	/** @var string */
 	protected $subject;
 
-	/** @var string */
-	protected $body;
+	/** @var string|null */
+	protected $bodyPlain;
+
+	/** @var string|null */
+	protected $bodyHtml;
 
 	/** @var string|null */
 	protected $editorBody;
@@ -163,7 +168,8 @@ public function jsonSerialize() {
 			'sendAt' => $this->getSendAt(),
 			'updatedAt' => $this->getUpdatedAt(),
 			'subject' => $this->getSubject(),
-			'body' => $this->getBody(),
+			'bodyPlain' => $this->getBodyPlain(),
+			'bodyHtml' => $this->getBodyHtml(),
 			'editorBody' => $this->getEditorBody(),
 			'isHtml' => ($this->isHtml() === true),
 			'isPgpMime' => ($this->isPgpMime() === true),

lib/Migration/Version4200Date20241210000000.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Mail\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version4200Date20241210000000 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		$schema = $schemaClosure();
+
+		$outboxTable = $schema->getTable('mail_local_messages');
+		if ($outboxTable->hasColumn('body')) {
+			$outboxTable->dropColumn('body');
+		}
+		if (!$outboxTable->hasColumn('body_plain')) {
+			$outboxTable->addColumn('body_plain', Types::TEXT, [
+				'notnull' => false,
+			]);
+		}
+		if (!$outboxTable->hasColumn('body_html')) {
+			$outboxTable->addColumn('body_html', Types::TEXT, [
+				'notnull' => false,
+			]);
+		}
+		return $schema;
+	}
+}

lib/Provider/Command/MessageSend.php

@@ -75,10 +75,13 @@ public function perform(string $userId, string $serviceId, IMessage $message, ar
 		$localMessage->setType($localMessage::TYPE_OUTGOING);
 		$localMessage->setAccountId($account->getId());
 		$localMessage->setSubject((string)$message->getSubject());
-		$localMessage->setBody((string)$message->getBody());
-		// disabled due to issues caused by opening these messages in gui
-		//$localMessage->setEditorBody($message->getBody());
-		$localMessage->setHtml(true);
+		$localMessage->setBodyPlain($message->getBodyPlain());
+		$localMessage->setBodyHtml($message->getBodyHtml());
+		if (!empty($message->getBodyHtml())) {
+			$localMessage->setHtml(true);
+		} else {
+			$localMessage->setHtml(false);
+		}
 		$localMessage->setSendAt($this->time->getTime());
 		// convert mail provider addresses to recipient addresses
 		$to = $this->convertAddressArray($message->getTo());

lib/Service/MailTransmission.php

@@ -122,8 +122,8 @@ public function sendMessage(Account $account, LocalMessage $localMessage): void
 			new DataUriParser()
 		);
 		$mimePart = $mimeMessage->build(
-			$localMessage->isHtml(),
-			$localMessage->getBody(),
+			$localMessage->getBodyPlain(),
+			$localMessage->getBodyHtml(),
 			$attachmentParts,
 			$localMessage->isPgpMime() === true
 		);