From ca06d70047927705e283eadd1d928dcc76217301 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Fri, 12 Dec 2025 13:11:13 -0600
Subject: [PATCH] Improve performance of saveMessagesIndividually

Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
---
 ts/sql/Server.node.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ts/sql/Server.node.ts b/ts/sql/Server.node.ts
index 8376823064..1faa22a134 100644
--- a/ts/sql/Server.node.ts
+++ b/ts/sql/Server.node.ts
@@ -3178,6 +3178,15 @@ function saveMessagesIndividually(
   arrayOfMessages: ReadonlyArray<ReadonlyDeep<MessageType>>,
   options: { forceSave?: boolean; ourAci: AciString }
 ): { failedIndices: Array<number> } {
+  try {
+    saveMessages(db, arrayOfMessages, options);
+    return { failedIndices: [] };
+  } catch (e) {
+    logger.error(
+      'saveMessagesIndividually: Failed to save messages in one transaction, falling over to individual saves'
+    );
+  }
+
   return db.transaction(() => {
     const failedIndices: Array<number> = [];
     arrayOfMessages.forEach((message, index) => {