dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-06-03 23:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: support accepting contact requests for non active users (for accepting via notification) (#1809)

Browse Source 
* core: support accepting contact requests for non active users (for accepting via notification)

* getContactRequest'
This commit is contained in:
JRoberts
2023-01-20 17:55:57 +04:00
committed by GitHub
parent 980c7a9ddd
commit 7dd4dc3b40
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+5 -5
View File
@@ -659,18 +659,18 @@ processChatCommand = \case
pure $ CRChatCleared user (AChatInfo SCTGroup $ GroupChat gInfo)
CTContactConnection -> pure $ chatCmdError (Just user) "not supported"
CTContactRequest -> pure $ chatCmdError (Just user) "not supported"
APIAcceptContact connReqId -> withUser $ \user@User {userId} -> withChatLock "acceptContact" $ do
cReq <- withStore $ \db -> getContactRequest db userId connReqId
APIAcceptContact connReqId -> withUser $ \_ -> withChatLock "acceptContact" $ do
(user, cReq) <- withStore $ \db -> getContactRequest' db connReqId
-- [incognito] generate profile to send, create connection with incognito profile
incognito <- readTVarIO =<< asks incognitoMode
incognitoProfile <- if incognito then Just . NewIncognito <$> liftIO generateRandomProfile else pure Nothing
ct <- acceptContactRequest user cReq incognitoProfile
pure $ CRAcceptingContactRequest user ct
APIRejectContact connReqId -> withUser $ \user@User {userId} -> withChatLock "rejectContact" $ do
APIRejectContact connReqId -> withUser $ \user -> withChatLock "rejectContact" $ do
cReq@UserContactRequest {agentContactConnId = AgentConnId connId, agentInvitationId = AgentInvId invId} <-
withStore $ \db ->
getContactRequest db userId connReqId
`E.finally` liftIO (deleteContactRequest db userId connReqId)
getContactRequest db user connReqId
`E.finally` liftIO (deleteContactRequest db user connReqId)
withAgent $ \a -> rejectContact a connId invId
pure $ CRContactRequestRejected user cReq
APISendCallInvitation contactId callType -> withUser $ \user -> do