diff --git a/src/Simplex/Chat/Messages.hs b/src/Simplex/Chat/Messages.hs index 52cebd44d..0030b9f2f 100644 --- a/src/Simplex/Chat/Messages.hs +++ b/src/Simplex/Chat/Messages.hs @@ -533,10 +533,10 @@ data CIContent (d :: MsgDirection) where deriving instance Show (CIContent d) data RcvGroupEvent - = RGEMemberAdded GroupMemberId Profile -- CRJoinedGroupMemberConnecting + = RGEMemberAdded {groupMemberId :: GroupMemberId, profile :: Profile} -- CRJoinedGroupMemberConnecting | RGEMemberConnected -- CRUserJoinedGroup, CRJoinedGroupMember, CRConnectedToGroupMember | RGEMemberLeft -- CRLeftMember - | RGEMemberDeleted GroupMemberId Profile -- CRDeletedMember + | RGEMemberDeleted {groupMemberId :: GroupMemberId, profile :: Profile} -- CRDeletedMember | RGEUserDeleted -- CRDeletedMemberUser | RGEGroupDeleted -- CRGroupDeleted deriving (Show, Generic) @@ -549,7 +549,7 @@ instance ToJSON RcvGroupEvent where toEncoding = J.genericToEncoding . sumTypeJSON $ dropPrefix "RGE" data SndGroupEvent - = SGEMemberDeleted GroupMemberId Profile -- CRUserDeletedMember + = SGEMemberDeleted {groupMemberId :: GroupMemberId, profile :: Profile} -- CRUserDeletedMember | SGEUserLeft -- CRLeftMemberUser deriving (Show, Generic) diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs index d62ff467a..80d99490f 100644 --- a/src/Simplex/Chat/Types.hs +++ b/src/Simplex/Chat/Types.hs @@ -168,8 +168,8 @@ type ContactName = Text type GroupName = Text optionalFullName :: ContactName -> Text -> Text -optionalFullName localDisplayName fullName - | T.null fullName || localDisplayName == fullName = "" +optionalFullName displayName fullName + | T.null fullName || displayName == fullName = "" | otherwise = " (" <> fullName <> ")" data Group = Group {groupInfo :: GroupInfo, members :: [GroupMember]}