dandri/simplexmq
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-06-08 08:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

agent: use strict tables (#1686)

Browse Source 
* agent: use strict tables

* migrate existing tables to strict

* test: verify that all tables are strict

* fix column types for device_token and ntf_mode

* fix encodings and column types for ntf_sub_action and ntf_sub_smp_action

* update schema

* remove debug.trace

* log
This commit is contained in:
Evgeny
2026-01-03 17:19:18 +00:00
committed by GitHub
parent d6df769799
commit a7b43b1a3e
17 changed files with 269 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Messaging/Notifications/Types.hs
+21 -21
View File
@@ -13,8 +13,10 @@ import Simplex.Messaging.Agent.Protocol (ConnId, NotificationsMode (..), UserId)
import Simplex.Messaging.Agent.Store.DB (Binary (..), FromField (..), ToField (..), blobFieldDecoder, fromTextField_)
import qualified Simplex.Messaging.Crypto as C
import Simplex.Messaging.Encoding
import Simplex.Messaging.Encoding.String
import Simplex.Messaging.Notifications.Protocol
import Simplex.Messaging.Protocol (NotifierId, NtfServer, SMPServer)
import Simplex.Messaging.Util (eitherToMaybe)
data NtfTknAction
= NTARegister
@@ -101,42 +103,40 @@ data NtfSubNTFAction
| NSARotate -- deprecated
deriving (Show)
instance Encoding NtfSubNTFAction where
smpEncode = \case
instance TextEncoding NtfSubNTFAction where
textEncode = \case
NSACreate -> "N"
NSACheck -> "C"
NSADelete -> "D"
NSARotate -> "R"
smpP =
A.anyChar >>= \case
'N' -> pure NSACreate
'C' -> pure NSACheck
'D' -> pure NSADelete
'R' -> pure NSARotate
_ -> fail "bad NtfSubNTFAction"
textDecode = \case
"N" -> Just NSACreate
"C" -> Just NSACheck
"D" -> Just NSADelete
"R" -> Just NSARotate
_ -> Nothing
instance FromField NtfSubNTFAction where fromField = blobFieldDecoder smpDecode
instance FromField NtfSubNTFAction where fromField = fromTextField_ textDecode
instance ToField NtfSubNTFAction where toField = toField . Binary . smpEncode
instance ToField NtfSubNTFAction where toField = toField . textEncode
data NtfSubSMPAction
= NSASmpKey
| NSASmpDelete
deriving (Show)
instance Encoding NtfSubSMPAction where
smpEncode = \case
instance TextEncoding NtfSubSMPAction where
textEncode = \case
NSASmpKey -> "K"
NSASmpDelete -> "D"
smpP =
A.anyChar >>= \case
'K' -> pure NSASmpKey
'D' -> pure NSASmpDelete
_ -> fail "bad NtfSubSMPAction"
textDecode = \case
"K" -> Just NSASmpKey
"D" -> Just NSASmpDelete
_ -> Nothing
instance FromField NtfSubSMPAction where fromField = blobFieldDecoder smpDecode
instance FromField NtfSubSMPAction where fromField = fromTextField_ textDecode
instance ToField NtfSubSMPAction where toField = toField . Binary . smpEncode
instance ToField NtfSubSMPAction where toField = toField . textEncode
data NtfAgentSubStatus
= -- | subscription started
@@ -171,7 +171,7 @@ instance Encoding NtfAgentSubStatus where
"DELETED" -> pure NASDeleted
_ -> fail "bad NtfAgentSubStatus"
instance FromField NtfAgentSubStatus where fromField = fromTextField_ $ either (const Nothing) Just . smpDecode . encodeUtf8
instance FromField NtfAgentSubStatus where fromField = fromTextField_ $ eitherToMaybe . smpDecode . encodeUtf8
instance ToField NtfAgentSubStatus where toField = toField . decodeLatin1 . smpEncode