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

update protocol

Browse Source
This commit is contained in:
spaced4ndy
2025-10-22 18:29:20 +04:00
parent d6bce10117
commit 7a12fe304f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Simplex/Chat/Protocol.hs
View File

@@ -328,9 +328,9 @@ data ChatMsgEvent (e :: MsgEncoding) where
XGrpLinkReject :: GroupLinkRejection -> ChatMsgEvent 'Json
XGrpLinkMem :: Profile -> ChatMsgEvent 'Json
XGrpLinkAcpt :: GroupAcceptance -> GroupMemberRole -> MemberId -> ChatMsgEvent 'Json
XGrpRelayInv :: GroupRelayInvitation -> ChatMsgEvent 'Json
XGrpRelayInv :: ConnLinkContact -> ChatMsgEvent 'Json
XGrpRelayAcpt :: ConnLinkContact -> ChatMsgEvent 'Json -- TODO [chat relays] TBC short/long/any
XGrpRelayReady :: ChatMsgEvent 'Json
-- XGrpRelayReady :: ChatMsgEvent 'Json
XGrpMemNew :: MemberInfo -> Maybe MsgScope -> ChatMsgEvent 'Json
XGrpMemIntro :: MemberInfo -> Maybe MemberRestrictions -> ChatMsgEvent 'Json
XGrpMemInv :: MemberId -> IntroInvitation -> ChatMsgEvent 'Json
@@ -821,7 +821,7 @@ data CMEventTag (e :: MsgEncoding) where
XGrpLinkAcpt_ :: CMEventTag 'Json
XGrpRelayInv_ :: CMEventTag 'Json
XGrpRelayAcpt_ :: CMEventTag 'Json
XGrpRelayReady_ :: CMEventTag 'Json
-- XGrpRelayReady_ :: CMEventTag 'Json
XGrpMemNew_ :: CMEventTag 'Json
XGrpMemIntro_ :: CMEventTag 'Json
XGrpMemInv_ :: CMEventTag 'Json
@@ -877,7 +877,7 @@ instance MsgEncodingI e => StrEncoding (CMEventTag e) where
XGrpLinkAcpt_ -> "x.grp.link.acpt"
XGrpRelayInv_ -> "x.grp.relay.inv"
XGrpRelayAcpt_ -> "x.grp.relay.acpt"
XGrpRelayReady_ -> "x.grp.relay.ready"
-- XGrpRelayReady_ -> "x.grp.relay.ready"
XGrpMemNew_ -> "x.grp.mem.new"
XGrpMemIntro_ -> "x.grp.mem.intro"
XGrpMemInv_ -> "x.grp.mem.inv"
@@ -934,7 +934,7 @@ instance StrEncoding ACMEventTag where
"x.grp.link.acpt" -> XGrpLinkAcpt_
"x.grp.relay.inv" -> XGrpRelayInv_
"x.grp.relay.acpt" -> XGrpRelayAcpt_
"x.grp.relay.ready" -> XGrpRelayReady_
-- "x.grp.relay.ready" -> XGrpRelayReady_
"x.grp.mem.new" -> XGrpMemNew_
"x.grp.mem.intro" -> XGrpMemIntro_
"x.grp.mem.inv" -> XGrpMemInv_
@@ -987,7 +987,7 @@ toCMEventTag msg = case msg of
XGrpLinkAcpt {} -> XGrpLinkAcpt_
XGrpRelayInv _ -> XGrpRelayInv_
XGrpRelayAcpt _ -> XGrpRelayAcpt_
XGrpRelayReady -> XGrpRelayReady_
-- XGrpRelayReady -> XGrpRelayReady_
XGrpMemNew {} -> XGrpMemNew_
XGrpMemIntro _ _ -> XGrpMemIntro_
XGrpMemInv _ _ -> XGrpMemInv_
@@ -1105,9 +1105,9 @@ appJsonToCM AppMessageJson {v, msgId, event, params} = do
XGrpLinkReject_ -> XGrpLinkReject <$> p "groupLinkRejection"
XGrpLinkMem_ -> XGrpLinkMem <$> p "profile"
XGrpLinkAcpt_ -> XGrpLinkAcpt <$> p "acceptance" <*> p "role" <*> p "memberId"
XGrpRelayInv_ -> XGrpRelayInv <$> p "groupRelayInvitation"
XGrpRelayAcpt_ -> XGrpRelayAcpt <$> p "relayGroupLink"
XGrpRelayReady_ -> pure XGrpRelayReady
XGrpRelayInv_ -> XGrpRelayInv <$> p "groupLink"
XGrpRelayAcpt_ -> XGrpRelayAcpt <$> p "relayLink"
-- XGrpRelayReady_ -> pure XGrpRelayReady
XGrpMemNew_ -> XGrpMemNew <$> p "memberInfo" <*> opt "scope"
XGrpMemIntro_ -> XGrpMemIntro <$> p "memberInfo" <*> opt "memberRestrictions"
XGrpMemInv_ -> XGrpMemInv <$> p "memberId" <*> p "memberIntro"
@@ -1167,9 +1167,9 @@ chatToAppMessage chatMsg@ChatMessage {chatVRange, msgId, chatMsgEvent} = case en
XGrpLinkReject groupLinkRjct -> o ["groupLinkRejection" .= groupLinkRjct]
XGrpLinkMem profile -> o ["profile" .= profile]
XGrpLinkAcpt acceptance role memberId -> o ["acceptance" .= acceptance, "role" .= role, "memberId" .= memberId]
XGrpRelayInv groupRelayInv -> o ["groupRelayInvitation" .= groupRelayInv]
XGrpRelayAcpt relayGroupLink -> o ["relayGroupLink" .= relayGroupLink]
XGrpRelayReady -> JM.empty
XGrpRelayInv groupLink -> o ["groupLink" .= groupLink]
XGrpRelayAcpt relayLink -> o ["relayLink" .= relayLink]
-- XGrpRelayReady -> JM.empty
XGrpMemNew memInfo scope -> o $ ("scope" .=? scope) ["memberInfo" .= memInfo]
XGrpMemIntro memInfo memRestrictions -> o $ ("memberRestrictions" .=? memRestrictions) ["memberInfo" .= memInfo]
XGrpMemInv memId memIntro -> o ["memberId" .= memId, "memberIntro" .= memIntro]