dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-24 13:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

xInfoProbeOk for member

Browse Source
This commit is contained in:
Evgeny Poberezkin
2023-09-16 20:35:37 +01:00
parent 62d295488b
commit 5c148ab9f8
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+3 -10
View File
@@ -3262,7 +3262,6 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
void $ sendDirectMessage conn (XGrpMemIntro $ memberInfo (reMember intro)) (GroupId groupId)
withStore' $ \db -> updateIntroStatus db introId GMIntroSent
_ -> do
-- TODO send probe and decide whether to use existing contact connection or the new contact connection
-- TODO notify member who forwarded introduction - question - where it is stored? There is via_contact but probably there should be via_member in group_members table
withStore' (\db -> getViaGroupContact db user m) >>= \case
Nothing -> do
@@ -3274,14 +3273,6 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
notifyMemberConnected gInfo m $ Just ct
let connectedIncognito = contactConnIncognito ct || memberIncognito membership
when (memberCategory m == GCPreMember) $ probeMatchingContacts ct connectedIncognito
-- notifyMemberConnected gInfo m ct_
-- case ct_ of
-- Nothing -> do
-- let connectedIncognito = memberIncognito membership
-- when (memberCategory m == GCPreMember) $ probeMatchingMemberContact m connectedIncognito
-- Just ct -> do
-- let connectedIncognito = contactConnIncognito ct || memberIncognito membership
-- when (memberCategory m == GCPreMember) $ probeMatchingContacts ct connectedIncognito
MSG msgMeta _msgFlags msgBody -> do
cmdId <- createAckCmd conn
withAckMessage agentConnId cmdId msgMeta $ do
@@ -4311,7 +4302,9 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
Just (CGMContact c2@Contact {contactId = cId2})
| cId1 /= cId2 -> mergeContacts c1 c2
| otherwise -> messageWarning "xInfoProbeOk ignored: same contact id"
Just (CGMGroupMember _m2) -> pure ()
Just (CGMGroupMember m2@GroupMember {memberContactId})
| isNothing memberContactId -> connectContactToMember c1 m2
| otherwise -> messageWarning "xInfoProbeOk ignored: member already has contact"
_ -> pure ()
-- to party accepting call