dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-06 01:18:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor core-UI API to NameWarning with logic in core

Browse Source
This commit is contained in:
Alain Brenzikofer
2026-09-29 08:06:05 +02:00
parent b78d76ae64
commit 38b79929ca
19 changed files with 697 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bots/src/API/Docs/Types.hs
+5 -17
View File
@@ -47,7 +47,7 @@ import Simplex.Messaging.Agent.Protocol
import Simplex.Messaging.Client
import Simplex.Messaging.Crypto.File
import Simplex.Messaging.Parsers (dropPrefix, fstToLower)
import Simplex.Messaging.Protocol (BlockingInfo (..), BlockingReason (..), CommandError (..), ErrorType (..), NameErrorType (..), NamePricing (..), NameRecord (..), NameRegistration (..), NameReservedReason (..), NetworkError (..), ProxyError (..))
import Simplex.Messaging.Protocol (BlockingInfo (..), BlockingReason (..), CommandError (..), ErrorType (..), NameErrorType (..), NetworkError (..), ProxyError (..))
import Simplex.Messaging.Protocol.Types (ClientNotice (..))
import Simplex.Messaging.Transport
import Simplex.Chat.Remote.Types (CtrlAppInfo (..))
@@ -187,14 +187,6 @@ removeField n = updateFields $ mapMaybe (\f@(FieldInfo n' _) -> if n == n' then
updateFields :: ([FieldInfo] -> [FieldInfo]) -> SumTypeInfo -> SumTypeInfo
updateFields f st@(STI _ records) = st {recordTypes = map (\(RecordTypeInfo name fields) -> RecordTypeInfo name $ f fields) records}
-- JSON field names drop the "nr" prefix, as NameRecord's deriveJSON does
nameRecordType :: SumTypeInfo
nameRecordType =
let st@(STI _ records) = sti @NameRecord
dropNr (FieldInfo n t) = FieldInfo (dropPrefix "nr" n) t
updateRecord (RecordTypeInfo name fields) = RecordTypeInfo name $ map dropNr fields
in st {recordTypes = map updateRecord records}
-- type info, JSON encoding, constructor prefix, removed constructors, string encoding for commands, description
chatTypesDocsData :: [(SumTypeInfo, SumTypeJsonEncoding, String, [ConsName], Expr, Text)]
chatTypesDocsData =
@@ -343,10 +335,8 @@ chatTypesDocsData =
(sti @MsgSigStatus, STEnum, "MSS", [], "", ""),
(sti @MsgVerified, STUnion, "MV", [], "", ""),
(sti @NameErrorType, STUnion, "", [], "", ""),
(sti @NamePricing, STRecord, "", [], "", ""),
(nameRecordType, STRecord, "", [], "", ""),
(sti @NameRegistration, STUnion, "NR", [], "", ""),
(sti @NameReservedReason, STEnum, "NRR", ["NRRUnknown"], "", ""),
(sti @NamePrice, STRecord, "", [], "", ""),
(sti @NameWarning, STUnion, "NW", [], "", ""),
(sti @NetworkError, STUnion, "NE", [], "", ""),
(sti @NewUser, STRecord, "", [], "", ""),
(sti @NoteFolder, STRecord, "", [], "", ""),
@@ -587,10 +577,8 @@ deriving instance Generic MsgReceiptStatus
deriving instance Generic MsgSigStatus
deriving instance Generic MsgVerified
deriving instance Generic NameErrorType
deriving instance Generic NamePricing
deriving instance Generic NameRecord
deriving instance Generic NameRegistration
deriving instance Generic NameReservedReason
deriving instance Generic NamePrice
deriving instance Generic NameWarning
deriving instance Generic NetworkError
deriving instance Generic NewUser
deriving instance Generic NoteFolder
bots/src/API/TypeInfo.hs
-1
View File
@@ -169,7 +169,6 @@ toTypeInfo tr =
"AgentUserId" -> ST TInt64 []
"DBEntityId'" -> ST TInt64 []
"Integer" -> ST TInt64 []
"RoundedSystemTime" -> ST TInt64 []
"USDCents" -> ST TInt64 []
"Version" -> ST TInt []
"VersionRoster" -> ST TInt64 []