diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs index a12c7d0cd9..42bea328ea 100644 --- a/src/Simplex/Chat/Library/Commands.hs +++ b/src/Simplex/Chat/Library/Commands.hs @@ -3172,10 +3172,10 @@ processChatCommand cxt nm = \case else void $ deleteOrUpdateMemberRecordIO db user gInfo m pure m {memberStatus = GSMemRemoved} deleteMessages user gInfo@GroupInfo {membership} ms = do - archiveMembersReports user gInfo ms membership True if groupFeatureUserAllowed SGFFullDelete gInfo then deleteGroupMembersCIs user gInfo ms else markGroupMembersCIsDeleted user gInfo ms membership + archiveMembersReports user gInfo ms membership True APILeaveGroup groupId -> withUser $ \user@User {userId} -> do gInfo@GroupInfo {membership} <- withFastStore $ \db -> getGroupInfo db cxt user groupId filesInfo <- withFastStore' $ \db -> getGroupFileInfo db user gInfo diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 0981c72ec3..543d330296 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -3655,10 +3655,10 @@ processAgentMessageConn cxt user@User {userId} corrId agentConnId agentMessage = groupMsgToView cInfo ci deleteMessages :: GroupInfo -> GroupMember -> CM () deleteMessages gInfo' delMem = do - archiveMembersReports user gInfo' [delMem] m False if groupFeatureMemberAllowed SGFFullDelete m gInfo' then deleteGroupMemberCIs user gInfo' delMem else markGroupMemberCIsDeleted user gInfo' delMem m + archiveMembersReports user gInfo' [delMem] m False forwardToMember :: GroupMember -> CM () forwardToMember member = let fwd = GrpMsgForward {fwdSender = FwdMember (memberId' m) (memberShortenedName m), fwdBrokerTs = brokerTs}