From 432b270b34f6d375825062adcd72adfac52fedf3 Mon Sep 17 00:00:00 2001
From: RoyceDa <admin@rosetta-im.com>
Date: Mon, 16 Feb 2026 19:28:36 +0200
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B0=20=D1=81=20=D1=83=D0=BD=D0=B8=D0=BA=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=BC=D0=B8=20=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B8=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/providers/DatabaseProvider/DatabaseProvider.tsx | 11 ++++++++---
 app/providers/DatabaseProvider/tables.ts            |  5 +++++
 app/providers/DialogProvider/useDialogFiber.ts      |  4 ++--
 app/providers/DialogProvider/useSynchronize.ts      |  4 ++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/providers/DatabaseProvider/DatabaseProvider.tsx b/app/providers/DatabaseProvider/DatabaseProvider.tsx
index e9b99d9..8d09749 100644
--- a/app/providers/DatabaseProvider/DatabaseProvider.tsx
+++ b/app/providers/DatabaseProvider/DatabaseProvider.tsx
@@ -19,10 +19,15 @@ export function DatabaseProvider(props: DatabaseProviderProps) {
             setInitialized(true);
             //await runQuery("DROP TABLE IF EXISTS accounts_sync_times");
             /**
-             * Добавляем уникальный индекс на столбец message_id в таблица
-             * messages чтобы избежать дубликации сообщений
+             * Удаляем старый индекс только по message_id
              */
-            await runQuery("CREATE UNIQUE INDEX IF NOT EXISTS idx_messages_message_id ON messages(message_id)");
+            await runQuery("DROP INDEX IF EXISTS idx_messages_message_id");
+            
+            /**
+             * Добавляем уникальный индекс на столбцы message_id и public_key
+             * в таблице messages чтобы избежать дубликации сообщений
+             */
+            await runQuery("CREATE UNIQUE INDEX IF NOT EXISTS idx_messages_message_id_public_key ON messages(message_id, account)");
         })();
     }, []);
 
diff --git a/app/providers/DatabaseProvider/tables.ts b/app/providers/DatabaseProvider/tables.ts
index 51fe41b..d47ddc2 100644
--- a/app/providers/DatabaseProvider/tables.ts
+++ b/app/providers/DatabaseProvider/tables.ts
@@ -42,6 +42,11 @@ export const TABLES = [
         attachments TEXT NOT NULL DEFAULT '[]',
         UNIQUE (id)
     )`,
+    
+    /**
+     * Создаем индекс на столбцы message_id и public_key чтобы избежать дубликации сообщений при синхронизации
+     */
+    `CREATE UNIQUE INDEX IF NOT EXISTS idx_messages_message_id_public_key ON messages(message_id, account)`,
 
     `CREATE TABLE IF NOT EXISTS cached_users (
         public_key TEXT PRIMARY KEY,
diff --git a/app/providers/DialogProvider/useDialogFiber.ts b/app/providers/DialogProvider/useDialogFiber.ts
index 4d065ec..0ab71e3 100644
--- a/app/providers/DialogProvider/useDialogFiber.ts
+++ b/app/providers/DialogProvider/useDialogFiber.ts
@@ -70,8 +70,8 @@ export function useDialogFiber() {
         }
         await runQuery(
             "INSERT INTO accounts_sync_times (account, last_sync) VALUES (?, ?) " +
-                "ON CONFLICT(account) DO UPDATE SET last_sync = ?",
-            [publicKey, timestamp, timestamp]
+                "ON CONFLICT(account) DO UPDATE SET last_sync = ? WHERE account = ?",
+            [publicKey, timestamp, timestamp, publicKey]
         );
     };    
 
diff --git a/app/providers/DialogProvider/useSynchronize.ts b/app/providers/DialogProvider/useSynchronize.ts
index 6b8a532..aa7e146 100644
--- a/app/providers/DialogProvider/useSynchronize.ts
+++ b/app/providers/DialogProvider/useSynchronize.ts
@@ -54,8 +54,8 @@ export function useSynchronize() {
             console.info("Batch finished");
             await runQuery(
                 "INSERT INTO accounts_sync_times (account, last_sync) VALUES (?, ?) " +
-                "ON CONFLICT(account) DO UPDATE SET last_sync = ?",
-                [publicKey, packet.getTimestamp(), packet.getTimestamp()]
+                "ON CONFLICT(account) DO UPDATE SET last_sync = ? WHERE account = ?",
+                [publicKey, packet.getTimestamp(), packet.getTimestamp(), publicKey]
             );               
             console.info("Batch complete", publicKey, packet.getTimestamp());  
             trySync();