Merge branch 'master' into chat-relays

src/Simplex/Chat/Store/Groups.hs

@@ -68,7 +68,6 @@ module Simplex.Chat.Store.Groups
     getGroupModerators,
     getGroupRelayMembers,
     getGroupMembersForExpiration,
-    getGroupCurrentMembersCount,
     deleteGroupChatItems,
     deleteGroupMembers,
     cleanupHostGroupLinkConn,
@@ -1164,20 +1163,6 @@ getGroupMembersForExpiration db vr user@User {userId, userContactId} GroupInfo {
       )
       (groupId, userId, userContactId, GSMemRemoved, GSMemLeft, GSMemGroupDeleted, GSMemUnknown)
 
-getGroupCurrentMembersCount :: DB.Connection -> User -> GroupInfo -> IO Int
-getGroupCurrentMembersCount db User {userId} GroupInfo {groupId} = do
-  statuses :: [GroupMemberStatus] <-
-    map fromOnly
-      <$> DB.query
-        db
-        [sql|
-          SELECT member_status
-          FROM group_members
-          WHERE group_id = ? AND user_id = ?
-        |]
-        (groupId, userId)
-  pure $ length $ filter memberCurrent' statuses
-
 getGroupInvitation :: DB.Connection -> VersionRangeChat -> User -> GroupId -> ExceptT StoreError IO ReceivedGroupInvitation
 getGroupInvitation db vr user groupId =
   getConnRec_ user >>= \case

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

@@ -1197,6 +1197,10 @@ 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=?)
@@ -1205,10 +1209,6 @@ 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

@@ -1588,14 +1588,6 @@ Plan:
 SEARCH g USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH i USING INTEGER PRIMARY KEY (rowid=?)
 
-Query: 
-          SELECT member_status
-          FROM group_members
-          WHERE group_id = ? AND user_id = ?
-        
-Plan:
-SEARCH group_members USING INDEX idx_group_members_group_id (user_id=? AND group_id=?)
-
 Query: 
           SELECT r.file_id
           FROM rcv_files r
@@ -5000,14 +4992,6 @@ 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