dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-25 09:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: repeated invite correctly updates role if changed (#1327)

Browse Source
This commit is contained in:
JRoberts
2022-11-09 14:12:42 +04:00
committed by GitHub
parent 54ad071655
commit 21ffe0ad49
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Simplex/Chat.hs
View File

@@ -856,10 +856,11 @@ processChatCommand = \case
member <- withStore $ \db -> createNewContactMember db gVar user groupId contact memRole agentConnId cReq
sendInvitation member cReq
pure $ CRSentGroupInvitation gInfo contact member
Just member@GroupMember {groupMemberId, memberStatus}
| memberStatus == GSMemInvited ->
Just member@GroupMember {groupMemberId, memberStatus, memberRole = mRole}
| memberStatus == GSMemInvited -> do
unless (mRole == memRole) $ withStore' $ \db -> updateGroupMemberRole db user member memRole
withStore' (\db -> getMemberInvitation db user groupMemberId) >>= \case
Just cReq -> sendInvitation member cReq $> CRSentGroupInvitation gInfo contact member
Just cReq -> sendInvitation member {memberRole = memRole} cReq $> CRSentGroupInvitation gInfo contact member {memberRole = memRole}
Nothing -> throwChatError $ CEGroupCantResendInvitation gInfo cName
| otherwise -> throwChatError $ CEGroupDuplicateMember cName
APIJoinGroup groupId -> withUser $ \user@User {userId} -> do