Improve debuggability of thread datafix/threading-memory-footprint

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/IMAP/Threading/Container.php b/lib/IMAP/Threading/Container.php
index e57e390ac..9a25ad5fe 100644
--- a/lib/IMAP/Threading/Container.php
+++ b/lib/IMAP/Threading/Container.php
@@ -25,11 +25,12 @@ declare(strict_types=1);
 
 namespace OCA\Mail\IMAP\Threading;
 
+use JsonSerializable;
 use RuntimeException;
 use function array_key_exists;
 use function spl_object_id;
 
-class Container {
+class Container implements JsonSerializable {
 	/** @var Message|null */
 	private $message;
 
@@ -147,4 +148,13 @@ class Container {
 	public function getChildren(): array {
 		return $this->children;
 	}
+
+	public function jsonSerialize() {
+		return [
+			'message' => $this->message,
+			'id' => $this->id,
+			'root' => $this->root,
+			'children' => $this->children,
+		];
+	}
 }
diff --git a/lib/IMAP/Threading/DatabaseMessage.php b/lib/IMAP/Threading/DatabaseMessage.php
index a05dc8a47..eac8a44ff 100644
--- a/lib/IMAP/Threading/DatabaseMessage.php
+++ b/lib/IMAP/Threading/DatabaseMessage.php
@@ -110,6 +110,7 @@ class DatabaseMessage extends Message implements JsonSerializable {
 			parent::jsonSerialize(),
 			[
 				'databaseId' => $this->databaseId,
+				'threadRootId' => $this->getThreadRootId(),
 			]
 		);
 	}