Merge branch 'master' into f/batch-send

src/Simplex/Chat/Messages/CIContent.hs

@@ -574,3 +574,32 @@ dbParseACIContent = fmap aciContentDBJSON . J.eitherDecodeStrict' . encodeUtf8
 -- platform specific
 instance FromJSON ACIContent where
   parseJSON = fmap aciContentJSON . J.parseJSON
+
+toCIContentTag :: CIContent e -> Text
+toCIContentTag ciContent = case ciContent of
+  CISndMsgContent _ -> "sndMsgContent"
+  CIRcvMsgContent _ -> "rcvMsgContent"
+  CISndDeleted _ -> "sndDeleted"
+  CIRcvDeleted _ -> "rcvDeleted"
+  CISndCall {} -> "sndCall"
+  CIRcvCall {} -> "rcvCall"
+  CIRcvIntegrityError _ -> "rcvIntegrityError"
+  CIRcvDecryptionError {} -> "rcvDecryptionError"
+  CIRcvGroupInvitation {} -> "rcvGroupInvitation"
+  CISndGroupInvitation {} -> "sndGroupInvitation"
+  CIRcvDirectEvent _ -> "rcvDirectEvent"
+  CIRcvGroupEvent _ -> "rcvGroupEvent"
+  CISndGroupEvent _ -> "sndGroupEvent"
+  CIRcvConnEvent _ -> "rcvConnEvent"
+  CISndConnEvent _ -> "sndConnEvent"
+  CIRcvChatFeature {} -> "rcvChatFeature"
+  CISndChatFeature {} -> "sndChatFeature"
+  CIRcvChatPreference {} -> "rcvChatPreference"
+  CISndChatPreference {} -> "sndChatPreference"
+  CIRcvGroupFeature {} -> "rcvGroupFeature"
+  CISndGroupFeature {} -> "sndGroupFeature"
+  CIRcvChatFeatureRejected _ -> "rcvChatFeatureRejected"
+  CIRcvGroupFeatureRejected _ -> "rcvGroupFeatureRejected"
+  CISndModerated -> "sndModerated"
+  CIRcvModerated -> "rcvModerated"
+  CIInvalidJSON _ -> "invalidJSON"

src/Simplex/Chat/Migrations/M20231214_item_content_tag.hs

@@ -0,0 +1,18 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Migrations.M20231214_item_content_tag where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20231214_item_content_tag :: Query
+m20231214_item_content_tag =
+  [sql|
+ALTER TABLE chat_items ADD COLUMN item_content_tag TEXT;
+|]
+
+down_m20231214_item_content_tag :: Query
+down_m20231214_item_content_tag =
+  [sql|
+ALTER TABLE chat_items DROP COLUMN item_content_tag;
+|]

src/Simplex/Chat/Migrations/M20231215_recreate_msg_deliveries.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE QuasiQuotes #-}
 
-module Simplex.Chat.Migrations.M20231208_recreate_msg_deliveries where
+module Simplex.Chat.Migrations.M20231215_recreate_msg_deliveries where
 
 import Database.SQLite.Simple (Query)
 import Database.SQLite.Simple.QQ (sql)
 
-m20231208_recreate_msg_deliveries :: Query
-m20231208_recreate_msg_deliveries =
+m20231215_recreate_msg_deliveries :: Query
+m20231215_recreate_msg_deliveries =
   [sql|
 DROP INDEX msg_delivery_events_msg_delivery_id;
 DROP TABLE msg_delivery_events;
@@ -44,8 +44,8 @@ CREATE INDEX idx_msg_deliveries_agent_msg_id ON "msg_deliveries"(connection_id,
 CREATE INDEX idx_messages_group_id_created_at ON messages(group_id, created_at);
 |]
 
-down_m20231208_recreate_msg_deliveries :: Query
-down_m20231208_recreate_msg_deliveries =
+down_m20231215_recreate_msg_deliveries :: Query
+down_m20231215_recreate_msg_deliveries =
   [sql|
 DROP INDEX idx_messages_group_id_created_at;
 

src/Simplex/Chat/Migrations/chat_schema.sql

@@ -367,7 +367,8 @@ CREATE TABLE chat_items(
   item_live INTEGER,
   item_deleted_by_group_member_id INTEGER REFERENCES group_members ON DELETE SET NULL,
   item_deleted_ts TEXT,
-  forwarded_by_group_member_id INTEGER REFERENCES group_members ON DELETE SET NULL
+  forwarded_by_group_member_id INTEGER REFERENCES group_members ON DELETE SET NULL,
+  item_content_tag TEXT
 );
 CREATE TABLE chat_item_messages(
   chat_item_id INTEGER NOT NULL REFERENCES chat_items ON DELETE CASCADE,

src/Simplex/Chat/Store/Messages.hs

@@ -372,18 +372,19 @@ createNewChatItem_ db User {userId} chatDirection msgId_ sharedMsgId ciContent q
         -- user and IDs
         user_id, created_by_msg_id, contact_id, group_id, group_member_id,
         -- meta
-        item_sent, item_ts, item_content, item_text, item_status, shared_msg_id, forwarded_by_group_member_id, created_at, updated_at, item_live, timed_ttl, timed_delete_at,
+        item_sent, item_ts, item_content, item_content_tag, item_text, item_status, shared_msg_id,
+        forwarded_by_group_member_id, created_at, updated_at, item_live, timed_ttl, timed_delete_at,
         -- quote
         quoted_shared_msg_id, quoted_sent_at, quoted_content, quoted_sent, quoted_member_id
-      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
     |]
     ((userId, msgId_) :. idsRow :. itemRow :. quoteRow)
   ciId <- insertedRowId db
   forM_ msgId_ $ \msgId -> insertChatItemMessage_ db ciId msgId createdAt
   pure ciId
   where
-    itemRow :: (SMsgDirection d, UTCTime, CIContent d, Text, CIStatus d, Maybe SharedMsgId, Maybe GroupMemberId) :. (UTCTime, UTCTime, Maybe Bool) :. (Maybe Int, Maybe UTCTime)
-    itemRow = (msgDirection @d, itemTs, ciContent, ciContentToText ciContent, ciCreateStatus ciContent, sharedMsgId, forwardedByMember) :. (createdAt, createdAt, justTrue live) :. ciTimedRow timed
+    itemRow :: (SMsgDirection d, UTCTime, CIContent d, Text, Text, CIStatus d, Maybe SharedMsgId, Maybe GroupMemberId) :. (UTCTime, UTCTime, Maybe Bool) :. (Maybe Int, Maybe UTCTime)
+    itemRow = (msgDirection @d, itemTs, ciContent, toCIContentTag ciContent, ciContentToText ciContent, ciCreateStatus ciContent, sharedMsgId, forwardedByMember) :. (createdAt, createdAt, justTrue live) :. ciTimedRow timed
     idsRow :: (Maybe Int64, Maybe Int64, Maybe Int64)
     idsRow = case chatDirection of
       CDDirectRcv Contact {contactId} -> (Just contactId, Nothing, Nothing)

src/Simplex/Chat/Store/Migrations.hs

@@ -92,7 +92,8 @@ import Simplex.Chat.Migrations.M20231113_group_forward
 import Simplex.Chat.Migrations.M20231114_remote_control
 import Simplex.Chat.Migrations.M20231126_remote_ctrl_address
 import Simplex.Chat.Migrations.M20231207_chat_list_pagination
-import Simplex.Chat.Migrations.M20231208_recreate_msg_deliveries
+import Simplex.Chat.Migrations.M20231214_item_content_tag
+import Simplex.Chat.Migrations.M20231215_recreate_msg_deliveries
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -185,7 +186,8 @@ schemaMigrations =
     ("20231114_remote_control", m20231114_remote_control, Just down_m20231114_remote_control),
     ("20231126_remote_ctrl_address", m20231126_remote_ctrl_address, Just down_m20231126_remote_ctrl_address),
     ("20231207_chat_list_pagination", m20231207_chat_list_pagination, Just down_m20231207_chat_list_pagination),
-    ("20231208_recreate_msg_deliveries", m20231208_recreate_msg_deliveries, Just down_m20231208_recreate_msg_deliveries)
+    ("20231214_item_content_tag", m20231214_item_content_tag, Just down_m20231214_item_content_tag),
+    ("20231215_recreate_msg_deliveries", m20231215_recreate_msg_deliveries, Just down_m20231215_recreate_msg_deliveries)
   ]
 
 -- | The list of migrations in ascending order by date