Merge branch 'master' into f/channel-comments

src/Simplex/Chat/Store/Postgres/Migrations.hs

@@ -29,6 +29,8 @@ import Simplex.Chat.Store.Postgres.Migrations.M20260122_has_link
 import Simplex.Chat.Store.Postgres.Migrations.M20260222_chat_relays
 import Simplex.Chat.Store.Postgres.Migrations.M20260403_item_viewed
 import Simplex.Chat.Store.Postgres.Migrations.M20260407_channel_comments
+import Simplex.Chat.Store.Postgres.Migrations.M20260429_relay_request_retries
+import Simplex.Chat.Store.Postgres.Migrations.M20260507_relay_inactive_at
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Text, Maybe Text)]
@@ -57,7 +59,9 @@ schemaMigrations =
     ("20260122_has_link", m20260122_has_link, Just down_m20260122_has_link),
     ("20260222_chat_relays", m20260222_chat_relays, Just down_m20260222_chat_relays),
     ("20260403_item_viewed", m20260403_item_viewed, Just down_m20260403_item_viewed),
-    ("20260407_channel_comments", m20260407_channel_comments, Just down_m20260407_channel_comments)
+    ("20260407_channel_comments", m20260407_channel_comments, Just down_m20260407_channel_comments),
+    ("20260429_relay_request_retries", m20260429_relay_request_retries, Just down_m20260429_relay_request_retries),
+    ("20260507_relay_inactive_at", m20260507_relay_inactive_at, Just down_m20260507_relay_inactive_at)
   ]
 
 -- | The list of migrations in ascending order by date

src/Simplex/Chat/Store/Postgres/Migrations/M20260429_relay_request_retries.hs

@@ -0,0 +1,23 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20260429_relay_request_retries where
+
+import Data.Text (Text)
+import Text.RawString.QQ (r)
+
+m20260429_relay_request_retries :: Text
+m20260429_relay_request_retries =
+  [r|
+ALTER TABLE groups ADD COLUMN relay_request_retries BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE groups ADD COLUMN relay_request_delay BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE groups ADD COLUMN relay_request_execute_at TIMESTAMPTZ NOT NULL DEFAULT '1970-01-01 00:00:00+00';
+|]
+
+down_m20260429_relay_request_retries :: Text
+down_m20260429_relay_request_retries =
+  [r|
+ALTER TABLE groups DROP COLUMN relay_request_retries;
+ALTER TABLE groups DROP COLUMN relay_request_delay;
+ALTER TABLE groups DROP COLUMN relay_request_execute_at;
+|]

src/Simplex/Chat/Store/Postgres/Migrations/M20260507_relay_inactive_at.hs

@@ -0,0 +1,19 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20260507_relay_inactive_at where
+
+import Data.Text (Text)
+import Text.RawString.QQ (r)
+
+m20260507_relay_inactive_at :: Text
+m20260507_relay_inactive_at =
+  [r|
+ALTER TABLE groups ADD COLUMN relay_inactive_at TIMESTAMPTZ;
+|]
+
+down_m20260507_relay_inactive_at :: Text
+down_m20260507_relay_inactive_at =
+  [r|
+ALTER TABLE groups DROP COLUMN relay_inactive_at;
+|]

src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql

@@ -959,7 +959,11 @@ CREATE TABLE test_chat_schema.groups (
     root_priv_key bytea,
     root_pub_key bytea,
     member_priv_key bytea,
-    public_member_count bigint
+    public_member_count bigint,
+    relay_request_retries bigint DEFAULT 0 NOT NULL,
+    relay_request_delay bigint DEFAULT 0 NOT NULL,
+    relay_request_execute_at timestamp with time zone DEFAULT '1970-01-01 04:00:00+04'::timestamp with time zone NOT NULL,
+    relay_inactive_at timestamp with time zone
 );