core: open chat on "new" unread items (contigous unread aread in the end) (#6724)

* core: open chat on "new" unread items (contigous unread aread in the end)

* move

* ui: match first unread logic with core

---------

Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com>

src/Simplex/Chat/Store/Messages.hs

@@ -1303,7 +1303,8 @@ getDirectChatInitial_ db user ct contentFilter count = do
     Just minUnreadItemId -> do
       unreadCount <- liftIO $ getContactUnreadCount_ db user ct
       let stats = emptyChatStats {unreadCount, minUnreadItemId}
-      getDirectChatAround' db user ct contentFilter minUnreadItemId count "" stats
+      pivotId <- liftIO $ fromMaybe minUnreadItemId <$> getContactMaxViewedItemId_ db user ct
+      getDirectChatAround' db user ct contentFilter pivotId count "" stats
     Nothing -> (,Just $ NavigationInfo 0 0) <$> getDirectChatLast_ db user ct contentFilter count ""
 
 getContactStats_ :: DB.Connection -> User -> Contact -> IO ChatStats
@@ -1326,6 +1327,21 @@ getContactMinUnreadId_ db User {userId} Contact {contactId} =
       |]
       (userId, contactId, CISRcvNew)
 
+-- max viewed item: received read or sent (any item_status != CISRcvNew)
+getContactMaxViewedItemId_ :: DB.Connection -> User -> Contact -> IO (Maybe ChatItemId)
+getContactMaxViewedItemId_ db User {userId} Contact {contactId} =
+  fmap join . maybeFirstRow fromOnly $
+    DB.query
+      db
+      [sql|
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND item_status != ?
+        ORDER BY created_at DESC, chat_item_id DESC
+        LIMIT 1
+      |]
+      (userId, contactId, CISRcvNew)
+
 getContactUnreadCount_ :: DB.Connection -> User -> Contact -> IO Int
 getContactUnreadCount_ db User {userId} Contact {contactId} =
   fromOnly . head
@@ -1633,7 +1649,8 @@ getGroupChatInitial_ db user g scopeInfo_ contentFilter count = do
     Just minUnreadItemId -> do
       unreadCounts <- getGroupUnreadCount_ db user g scopeInfo_ Nothing
       stats <- liftIO $ getStats minUnreadItemId unreadCounts
-      getGroupChatAround' db user g scopeInfo_ contentFilter minUnreadItemId count "" stats
+      pivotId <- fromMaybe minUnreadItemId <$> getGroupMaxViewedItemId_ db user g scopeInfo_ contentFilter
+      getGroupChatAround' db user g scopeInfo_ contentFilter pivotId count "" stats
     Nothing -> do
       stats <- liftIO $ getStats 0 (0, 0)
       (,Just $ NavigationInfo 0 0) <$> getGroupChatLast_ db user g scopeInfo_ contentFilter count "" stats
@@ -1652,14 +1669,23 @@ getGroupStats_ db user g scopeInfo_ = do
 getGroupMinUnreadId_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ExceptT StoreError IO (Maybe ChatItemId)
 getGroupMinUnreadId_ db user g scopeInfo_ contentFilter =
   fmap join . maybeFirstRow fromOnly $
-    queryUnreadGroupItems db user g scopeInfo_ contentFilter baseQuery orderLimit
+    queryUnreadGroupItems db user g scopeInfo_ contentFilter " item_status = ? " baseQuery orderLimit
   where
     baseQuery = "SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ? "
     orderLimit = " ORDER BY item_ts ASC, chat_item_id ASC LIMIT 1"
 
+-- max viewed item: received read or sent (any item_status != CISRcvNew)
+getGroupMaxViewedItemId_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ExceptT StoreError IO (Maybe ChatItemId)
+getGroupMaxViewedItemId_ db user g scopeInfo_ contentFilter =
+  fmap join . maybeFirstRow fromOnly $
+    queryUnreadGroupItems db user g scopeInfo_ contentFilter " item_status != ? " baseQuery orderLimit
+  where
+    baseQuery = "SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ? "
+    orderLimit = " ORDER BY item_ts DESC, chat_item_id DESC LIMIT 1"
+
 getGroupUnreadCount_ :: DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> ExceptT StoreError IO (Int, Int)
 getGroupUnreadCount_ db user g scopeInfo_ contentFilter =
-  head <$> queryUnreadGroupItems db user g scopeInfo_ contentFilter baseQuery ""
+  head <$> queryUnreadGroupItems db user g scopeInfo_ contentFilter " item_status = ? " baseQuery ""
   where
     baseQuery = "SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ? "
 
@@ -1671,26 +1697,26 @@ getGroupReportsCount_ db User {userId} GroupInfo {groupId} archived =
       "SELECT COUNT(1) FROM chat_items WHERE user_id = ? AND group_id = ? AND msg_content_tag = ? AND item_deleted = ? AND item_sent = 0"
       (userId, groupId, MCReport_, BI archived)
 
-queryUnreadGroupItems :: FromRow r => DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> Query -> Query -> ExceptT StoreError IO [r]
-queryUnreadGroupItems db User {userId} GroupInfo {groupId} scopeInfo_ contentFilter baseQuery orderLimit =
+queryUnreadGroupItems :: FromRow r => DB.Connection -> User -> GroupInfo -> Maybe GroupChatScopeInfo -> Maybe MsgContentTag -> Query -> Query -> Query -> ExceptT StoreError IO [r]
+queryUnreadGroupItems db User {userId} GroupInfo {groupId} scopeInfo_ contentFilter statusCond baseQuery orderLimit =
   case (scopeInfo_, contentFilter) of
     (Nothing, Nothing) ->
       liftIO $
         DB.query
           db
-          (baseQuery <> " AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ? " <> orderLimit)
+          (baseQuery <> " AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND " <> statusCond <> orderLimit)
           (userId, groupId, CISRcvNew)
     (Nothing, Just mcTag) ->
       liftIO $
         DB.query
           db
-          (baseQuery <> " AND msg_content_tag = ? AND item_status = ? " <> orderLimit)
+          (baseQuery <> " AND msg_content_tag = ? AND " <> statusCond <> orderLimit)
           (userId, groupId, mcTag, CISRcvNew)
     (Just GCSIMemberSupport {groupMember_ = m}, Nothing) ->
       liftIO $
         DB.query
           db
-          (baseQuery <> " AND group_scope_tag = ? AND group_scope_group_member_id IS NOT DISTINCT FROM ? AND item_status = ? " <> orderLimit)
+          (baseQuery <> " AND group_scope_tag = ? AND group_scope_group_member_id IS NOT DISTINCT FROM ? AND " <> statusCond <> orderLimit)
           (userId, groupId, GCSTMemberSupport_, groupMemberId' <$> m, CISRcvNew)
     (Just _scope, Just _mcTag) ->
       throwError $ SEInternalError "group scope and content filter are not supported together"

src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt

@@ -1197,10 +1197,6 @@ Query: UPDATE connections SET smp_agent_version = ? WHERE conn_id = ?
 Plan:
 SEARCH connections USING PRIMARY KEY (conn_id=?)
 
-Query: UPDATE deleted_snd_chunk_replicas SET delay = ?, retries = retries + 1, updated_at = ? WHERE deleted_snd_chunk_replica_id = ?
-Plan:
-SEARCH deleted_snd_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)
-
 Query: UPDATE messages SET msg_body = x'' WHERE conn_id = ? AND internal_id = ?
 Plan:
 SEARCH messages USING PRIMARY KEY (conn_id=? AND internal_id=?)
@@ -1209,6 +1205,10 @@ Query: UPDATE ratchets SET ratchet_state = ? WHERE conn_id = ?
 Plan:
 SEARCH ratchets USING PRIMARY KEY (conn_id=?)
 
+Query: UPDATE rcv_file_chunk_replicas SET delay = ?, retries = retries + 1, updated_at = ? WHERE rcv_file_chunk_replica_id = ?
+Plan:
+SEARCH rcv_file_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)
+
 Query: UPDATE rcv_file_chunk_replicas SET received = 1, updated_at = ? WHERE rcv_file_chunk_replica_id = ?
 Plan:
 SEARCH rcv_file_chunk_replicas USING INTEGER PRIMARY KEY (rowid=?)

src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt

@@ -3133,6 +3133,16 @@ Query:
 Plan:
 SEARCH chat_items USING INDEX idx_chat_items_contact_id (contact_id=?)
 
+Query: 
+        SELECT chat_item_id
+        FROM chat_items
+        WHERE user_id = ? AND contact_id = ? AND item_status != ?
+        ORDER BY created_at DESC, chat_item_id DESC
+        LIMIT 1
+      
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_contacts_created_at (user_id=? AND contact_id=?)
+
 Query: 
         SELECT chat_item_id
         FROM chat_items
@@ -4733,6 +4743,14 @@ Query:
 Plan:
 SEARCH protocol_servers USING INTEGER PRIMARY KEY (rowid=?)
 
+Query: 
+      UPDATE rcv_files
+      SET to_receive = 1, user_approved_relays = ?, updated_at = ?
+      WHERE file_id = ?
+    
+Plan:
+SEARCH rcv_files USING INTEGER PRIMARY KEY (rowid=?)
+
 Query: 
       UPDATE remote_controllers
       SET ctrl_device_name = ?, dh_priv_key = ?, prev_dh_priv_key = dh_priv_key
@@ -6043,7 +6061,7 @@ Query: SELECT COUNT(1) FROM groups WHERE user_id = ? AND chat_item_ttl > 0
 Plan:
 SEARCH groups USING INDEX idx_groups_chat_ts (user_id=?)
 
-Query: SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ? 
+Query: SELECT COUNT(1), COALESCE(SUM(user_mention), 0) FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND  item_status = ? 
 Plan:
 SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_stats_all (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_status=?)
 
@@ -6085,7 +6103,11 @@ Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND contact_id = ?
 Plan:
 SEARCH chat_items USING INDEX idx_chat_items_direct_shared_msg_id (user_id=? AND contact_id=? AND shared_msg_id=?)
 
-Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND item_status = ?  ORDER BY item_ts ASC, chat_item_id ASC LIMIT 1
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND  item_status != ?  ORDER BY item_ts DESC, chat_item_id DESC LIMIT 1
+Plan:
+SEARCH chat_items USING INDEX idx_chat_items_group_scope_item_ts (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=?)
+
+Query: SELECT chat_item_id FROM chat_items WHERE user_id = ? AND group_id = ?  AND group_scope_tag IS NULL AND group_scope_group_member_id IS NULL AND  item_status = ?  ORDER BY item_ts ASC, chat_item_id ASC LIMIT 1
 Plan:
 SEARCH chat_items USING COVERING INDEX idx_chat_items_group_scope_item_status (user_id=? AND group_id=? AND group_scope_tag=? AND group_scope_group_member_id=? AND item_status=?)