core: return AChatItem in FileAccepted and FileStart events (#585)

src/Simplex/Chat/Controller.hs

@@ -205,9 +205,9 @@ data ChatResponse
   | CRContactRequestAlreadyAccepted {contact :: Contact}
   | CRLeftMemberUser {groupInfo :: GroupInfo}
   | CRGroupDeletedUser {groupInfo :: GroupInfo}
-  | CRRcvFileAccepted {fileTransfer :: RcvFileTransfer, filePath :: FilePath}
+  | CRRcvFileAccepted {chatItem :: AChatItem}
   | CRRcvFileAcceptedSndCancelled {rcvFileTransfer :: RcvFileTransfer}
-  | CRRcvFileStart {rcvFileTransfer :: RcvFileTransfer}
+  | CRRcvFileStart {chatItem :: AChatItem}
   | CRRcvFileComplete {chatItem :: AChatItem}
   | CRRcvFileCancelled {rcvFileTransfer :: RcvFileTransfer}
   | CRRcvFileSndCancelled {rcvFileTransfer :: RcvFileTransfer}

src/Simplex/Chat/Messages.hs

@@ -295,6 +295,7 @@ data CIFileStatus (d :: MsgDirection) where
   CIFSSndStored :: CIFileStatus 'MDSnd
   CIFSSndCancelled :: CIFileStatus 'MDSnd
   CIFSRcvInvitation :: CIFileStatus 'MDRcv
+  CIFSRcvAccepted :: CIFileStatus 'MDRcv
   CIFSRcvTransfer :: CIFileStatus 'MDRcv
   CIFSRcvComplete :: CIFileStatus 'MDRcv
   CIFSRcvCancelled :: CIFileStatus 'MDRcv
@@ -318,6 +319,7 @@ instance MsgDirectionI d => StrEncoding (CIFileStatus d) where
     CIFSSndStored -> "snd_stored"
     CIFSSndCancelled -> "snd_cancelled"
     CIFSRcvInvitation -> "rcv_invitation"
+    CIFSRcvAccepted -> "rcv_accepted"
     CIFSRcvTransfer -> "rcv_transfer"
     CIFSRcvComplete -> "rcv_complete"
     CIFSRcvCancelled -> "rcv_cancelled"
@@ -330,6 +332,7 @@ instance StrEncoding ACIFileStatus where
       "snd_stored" -> pure $ AFS SMDSnd CIFSSndStored
       "snd_cancelled" -> pure $ AFS SMDSnd CIFSSndCancelled
       "rcv_invitation" -> pure $ AFS SMDRcv CIFSRcvInvitation
+      "rcv_accepted" -> pure $ AFS SMDRcv CIFSRcvAccepted
       "rcv_transfer" -> pure $ AFS SMDRcv CIFSRcvTransfer
       "rcv_complete" -> pure $ AFS SMDRcv CIFSRcvComplete
       "rcv_cancelled" -> pure $ AFS SMDRcv CIFSRcvCancelled

src/Simplex/Chat/Store.hs

@@ -2093,14 +2093,14 @@ getRcvFileTransfer_ db userId fileId =
         cancelled = fromMaybe False cancelled_
     rcvFileTransfer _ = Left $ SERcvFileNotFound fileId
 
-acceptRcvFileTransfer :: StoreMonad m => SQLiteStore -> UserId -> Int64 -> ConnId -> FilePath -> m ()
-acceptRcvFileTransfer st userId fileId agentConnId filePath =
-  liftIO . withTransaction st $ \db -> do
+acceptRcvFileTransfer :: StoreMonad m => SQLiteStore -> User -> Int64 -> ConnId -> FilePath -> m AChatItem
+acceptRcvFileTransfer st user@User {userId} fileId agentConnId filePath =
+  liftIOEither . withTransaction st $ \db -> do
     currentTs <- getCurrentTime
     DB.execute
       db
       "UPDATE files SET file_path = ?, ci_file_status = ?, updated_at = ? WHERE user_id = ? AND file_id = ?"
-      (filePath, CIFSRcvTransfer, currentTs, userId, fileId)
+      (filePath, CIFSRcvAccepted, currentTs, userId, fileId)
     DB.execute
       db
       "UPDATE rcv_files SET file_status = ?, updated_at = ? WHERE file_id = ?"
@@ -2109,6 +2109,7 @@ acceptRcvFileTransfer st userId fileId agentConnId filePath =
       db
       "INSERT INTO connections (agent_conn_id, conn_status, conn_type, rcv_file_id, user_id, created_at, updated_at) VALUES (?,?,?,?,?,?,?)"
       (agentConnId, ConnJoined, ConnRcvFile, fileId, userId, currentTs, currentTs)
+    getChatItemByFileId_ db user fileId
 
 updateRcvFileStatus :: MonadUnliftIO m => SQLiteStore -> RcvFileTransfer -> FileStatus -> m ()
 updateRcvFileStatus st RcvFileTransfer {fileId} status =
@@ -3480,19 +3481,23 @@ getGroupChatItemIdByText st User {userId, localDisplayName = userName} groupId c
         (userId, groupId, cName, quotedMsg <> "%")
 
 getChatItemByFileId :: StoreMonad m => SQLiteStore -> User -> Int64 -> m AChatItem
-getChatItemByFileId st user@User {userId} fileId = do
-  liftIOEither . withTransaction st $ \db -> runExceptT $ do
-    r <- ExceptT $ getChatItemIdByFileId_ db userId fileId
-    case r of
-      (itemId, Just contactId, Nothing) -> do
-        ct <- ExceptT $ getContact_ db userId contactId
-        (CChatItem msgDir ci) <- ExceptT $ getDirectChatItem_ db userId contactId itemId
-        pure $ AChatItem SCTDirect msgDir (DirectChat ct) ci
-      (itemId, Nothing, Just groupId) -> do
-        gInfo <- ExceptT $ getGroupInfo_ db user groupId
-        (CChatItem msgDir ci) <- ExceptT $ getGroupChatItem_ db user groupId itemId
-        pure $ AChatItem SCTGroup msgDir (GroupChat gInfo) ci
-      _ -> throwError $ SEChatItemNotFoundByFileId fileId
+getChatItemByFileId st user fileId =
+  liftIOEither . withTransaction st $ \db ->
+    getChatItemByFileId_ db user fileId
+
+getChatItemByFileId_ :: DB.Connection -> User -> Int64 -> IO (Either StoreError AChatItem)
+getChatItemByFileId_ db user@User {userId} fileId = runExceptT $ do
+  r <- ExceptT $ getChatItemIdByFileId_ db userId fileId
+  case r of
+    (itemId, Just contactId, Nothing) -> do
+      ct <- ExceptT $ getContact_ db userId contactId
+      (CChatItem msgDir ci) <- ExceptT $ getDirectChatItem_ db userId contactId itemId
+      pure $ AChatItem SCTDirect msgDir (DirectChat ct) ci
+    (itemId, Nothing, Just groupId) -> do
+      gInfo <- ExceptT $ getGroupInfo_ db user groupId
+      (CChatItem msgDir ci) <- ExceptT $ getGroupChatItem_ db user groupId itemId
+      pure $ AChatItem SCTGroup msgDir (GroupChat gInfo) ci
+    _ -> throwError $ SEChatItemNotFoundByFileId fileId
 
 getChatItemIdByFileId_ :: DB.Connection -> UserId -> Int64 -> IO (Either StoreError (ChatItemId, Maybe Int64, Maybe Int64))
 getChatItemIdByFileId_ db userId fileId =

src/Simplex/Chat/View.hs

@@ -92,8 +92,7 @@ responseToView testView = \case
   CRUserDeletedMember g m -> [ttyGroup' g <> ": you removed " <> ttyMember m <> " from the group"]
   CRLeftMemberUser g -> [ttyGroup' g <> ": you left the group"] <> groupPreserved g
   CRGroupDeletedUser g -> [ttyGroup' g <> ": you deleted the group"]
-  CRRcvFileAccepted RcvFileTransfer {fileId, senderDisplayName = c} filePath ->
-    ["saving file " <> sShow fileId <> " from " <> ttyContact c <> " to " <> plain filePath]
+  CRRcvFileAccepted ci -> savingFile' ci
   CRRcvFileAcceptedSndCancelled ft -> viewRcvFileSndCancelled ft
   CRSndGroupFileCancelled ftm fts -> viewSndGroupFileCancelled ftm fts
   CRRcvFileCancelled ft -> receivingFile_ "cancelled" ft
@@ -101,7 +100,7 @@ responseToView testView = \case
   CRContactUpdated c c' -> viewContactUpdated c c'
   CRContactsMerged intoCt mergedCt -> viewContactsMerged intoCt mergedCt
   CRReceivedContactRequest UserContactRequest {localDisplayName = c, profile} -> viewReceivedContactRequest c profile
-  CRRcvFileStart ft -> receivingFile_ "started" ft
+  CRRcvFileStart ci -> receivingFile_' "started" ci
   CRRcvFileComplete ci -> receivingFile_' "completed" ci
   CRRcvFileSndCancelled ft -> viewRcvFileSndCancelled ft
   CRSndFileStart ft -> sendingFile_ "started" ft
@@ -556,6 +555,15 @@ humanReadableSize size
     mB = kB * 1024
     gB = mB * 1024
 
+savingFile' :: AChatItem -> [StyledString]
+savingFile' (AChatItem _ _ (DirectChat Contact {localDisplayName = c}) ChatItem {file = Just CIFile {fileId, filePath = Just filePath}, chatDir = CIDirectRcv}) =
+  ["saving file " <> sShow fileId <> " from " <> ttyContact c <> " to " <> plain filePath]
+savingFile' (AChatItem _ _ _ ChatItem {file = Just CIFile {fileId, filePath = Just filePath}, chatDir = CIGroupRcv GroupMember {localDisplayName = m}}) =
+  ["saving file " <> sShow fileId <> " from " <> ttyContact m <> " to " <> plain filePath]
+savingFile' (AChatItem _ _ _ ChatItem {file = Just CIFile {fileId, filePath = Just filePath}}) =
+  ["saving file " <> sShow fileId <> " to " <> plain filePath]
+savingFile' _ = ["saving file"] -- shouldn't happen
+
 receivingFile_' :: StyledString -> AChatItem -> [StyledString]
 receivingFile_' status (AChatItem _ _ (DirectChat Contact {localDisplayName = c}) ChatItem {file = Just CIFile {fileId, fileName}, chatDir = CIDirectRcv}) =
   [status <> " receiving " <> fileTransferStr fileId fileName <> " from " <> ttyContact c]