IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: fix group event chat items encoding (#825)

Browse Source
This commit is contained in:
JRoberts
2022-07-20 20:59:09 +04:00
committed by GitHub
parent 3c03c96a53
commit a509e85195
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Simplex/Chat/Messages.hs
View File

@@ -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)

4
src/Simplex/Chat/Types.hs
View File

@@ -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]}