This commit is contained in:
parent
b6c23b59ca
commit
37eef3c6c9
@ -3041,7 +3041,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
|
|||||||
groupConnReq@(CRInvitationUri _ _) -> case cmdFunction of
|
groupConnReq@(CRInvitationUri _ _) -> case cmdFunction of
|
||||||
-- [async agent commands] XGrpMemIntro continuation on receiving INV
|
-- [async agent commands] XGrpMemIntro continuation on receiving INV
|
||||||
CFCreateConnGrpMemInv
|
CFCreateConnGrpMemInv
|
||||||
| isCompatibleRange (peerChatVRange conn) groupNoDirectVRange -> sendWithoutDirectCReq
|
| isCompatibleRange (peerChatVRange conn) groupNoDirectVRange -> sendWithDirectCReq -- sendWithoutDirectCReq
|
||||||
| otherwise -> sendWithDirectCReq
|
| otherwise -> sendWithDirectCReq
|
||||||
where
|
where
|
||||||
sendWithoutDirectCReq = do
|
sendWithoutDirectCReq = do
|
||||||
@ -4290,7 +4290,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
|
|||||||
directConnIds <- case memberChatVRange of
|
directConnIds <- case memberChatVRange of
|
||||||
Nothing -> Just <$> createConn
|
Nothing -> Just <$> createConn
|
||||||
Just mcvr
|
Just mcvr
|
||||||
| isCompatibleRange (fromChatVRange mcvr) groupNoDirectVRange -> pure Nothing
|
| isCompatibleRange (fromChatVRange mcvr) groupNoDirectVRange -> Just <$> createConn -- pure Nothing
|
||||||
| otherwise -> Just <$> createConn
|
| otherwise -> Just <$> createConn
|
||||||
let customUserProfileId = if memberIncognito membership then Just (localProfileId $ memberProfile membership) else Nothing
|
let customUserProfileId = if memberIncognito membership then Just (localProfileId $ memberProfile membership) else Nothing
|
||||||
void $ withStore $ \db -> createIntroReMember db user gInfo m memInfo groupConnIds directConnIds customUserProfileId
|
void $ withStore $ \db -> createIntroReMember db user gInfo m memInfo groupConnIds directConnIds customUserProfileId
|
||||||
|
@ -68,17 +68,17 @@ chatGroupTests = do
|
|||||||
it "should send delivery receipts in group depending on configuration" testConfigureGroupDeliveryReceipts
|
it "should send delivery receipts in group depending on configuration" testConfigureGroupDeliveryReceipts
|
||||||
describe "direct connections in group are not established based on chat protocol version" $ do
|
describe "direct connections in group are not established based on chat protocol version" $ do
|
||||||
describe "3 members group" $ do
|
describe "3 members group" $ do
|
||||||
testNoDirect _0 _0 True
|
testNoDirect _0 _0 False -- True
|
||||||
testNoDirect _0 _1 True
|
testNoDirect _0 _1 False -- True
|
||||||
testNoDirect _1 _0 False
|
testNoDirect _1 _0 False
|
||||||
testNoDirect _1 _1 False
|
testNoDirect _1 _1 False
|
||||||
describe "4 members group" $ do
|
describe "4 members group" $ do
|
||||||
testNoDirect4 _0 _0 _0 True True True
|
testNoDirect4 _0 _0 _0 False False False -- True True True
|
||||||
testNoDirect4 _0 _0 _1 True True True
|
testNoDirect4 _0 _0 _1 False False False -- True True True
|
||||||
testNoDirect4 _0 _1 _0 True True False
|
testNoDirect4 _0 _1 _0 False False False -- True True False
|
||||||
testNoDirect4 _0 _1 _1 True True False
|
testNoDirect4 _0 _1 _1 False False False -- True True False
|
||||||
testNoDirect4 _1 _0 _0 False False True
|
testNoDirect4 _1 _0 _0 False False False -- False False True
|
||||||
testNoDirect4 _1 _0 _1 False False True
|
testNoDirect4 _1 _0 _1 False False False -- False False True
|
||||||
testNoDirect4 _1 _1 _0 False False False
|
testNoDirect4 _1 _1 _0 False False False
|
||||||
testNoDirect4 _1 _1 _1 False False False
|
testNoDirect4 _1 _1 _1 False False False
|
||||||
where
|
where
|
||||||
|
Loading…
Reference in New Issue
Block a user