dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-02 11:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
spaced4ndy
2026-06-29 14:18:20 +04:00
parent 148f3366d5
commit 3bc22dd3b9
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Library/Subscriber.hs
+11 -7
View File
@@ -3442,18 +3442,22 @@ processAgentMessageConn cxt user@User {userId} corrId agentConnId agentMessage =
`catchAllErrors` \_ -> pure (cs, as)
emitRosterResults :: GroupInfo -> GroupMember -> UTCTime -> ([MemberId], [(GroupMember, GroupMemberRole, Bool)]) -> CM ()
emitRosterResults gInfo author rosterBrokerTs (conflicts, applied) = do
emitRosterResults gInfo@GroupInfo {membership} author rosterBrokerTs (conflicts, applied) = do
forM_ conflicts $ \mid' ->
messageWarning $ "x.grp.roster: member key conflict, keeping trusted key, memberId=" <> safeDecodeUtf8 (strEncode mid')
forM_ applied $ \(member, fromRole, created) ->
unless created $ createItems member fromRole
unless created $ emitRoleChange member fromRole
where
createItems member fromRole = do
emitRoleChange member fromRole = do
let toRole = memberRole' member
gEvent = RGEMemberRole (groupMemberId' member) (fromLocalProfile $ memberProfile member) toRole
(gInfo', author', scopeInfo) <- mkGroupChatScope gInfo author
ci <- createChatItem user (CDGroupRcv gInfo' scopeInfo author') False (CIRcvGroupEvent gEvent) Nothing (Just MSSVerified) (Just rosterBrokerTs)
toView $ CEvtNewChatItems user [ci]
(gInfo', author') <-
if sameMemberId (memberId' membership) member
then do
(gInfo', author', scopeInfo) <- mkGroupChatScope gInfo author
ci <- createChatItem user (CDGroupRcv gInfo' scopeInfo author') False (CIRcvGroupEvent $ RGEUserRole toRole) Nothing (Just MSSVerified) (Just rosterBrokerTs)
toView $ CEvtNewChatItems user [ci]
pure (gInfo', author')
else pure (gInfo, author)
toView CEvtMemberRole {user, groupInfo = gInfo', byMember = author', member, fromRole, toRole, msgSigned = Just MSSVerified}
sendRosterAck :: GroupInfo -> GroupMember -> VersionRoster -> Maybe Text -> CM ()
tests/ChatTests/Groups.hs
+4
View File
@@ -9804,6 +9804,8 @@ testChannelRemovedModeratorRefreshesRoster ps =
threadDelay 1000000
alice ##> "/rm #team cath"
alice <## "#team: you removed cath from the group (signed)"
-- the relay applies the removal via the roster (revert to observer) before the delete delta
bob <## "#team: alice changed the role of cath from moderator to observer (signed)"
bob <## "#team: alice removed cath from the group (signed)"
cath <## "#team: alice removed you from the group (signed)"
cath <## "use /d #team to delete the group"
@@ -10024,6 +10026,8 @@ testChannelRemoveMemberSigned ps =
threadDelay 1000000
alice ##> "/rm #team eve"
alice <## "#team: you removed eve from the group (signed)"
-- the relay applies the removal via the roster (revert to observer) before the delete delta
bob <## "#team: alice changed the role of eve from member to observer (signed)"
bob <## "#team: alice removed eve from the group (signed)"
concurrentlyN_
[ cath <## "#team: alice removed eve from the group (signed)",