agent: replace sndSecure with queueMode in queue URIs and records (#1502)

* agent: replace sndSecure with queueMode in queue URIs and records

* fix test
This commit is contained in:
Evgeny
2025-03-31 16:54:29 +01:00
committed by GitHub
parent dd67de4d71
commit 94ee3ceced
17 changed files with 197 additions and 115 deletions
@@ -10,18 +10,12 @@ import qualified Data.Aeson.TH as JQ
import qualified Data.Attoparsec.ByteString.Char8 as A
import qualified Data.ByteString.Lazy.Char8 as LB
import Data.Text (Text)
import Data.Text.Encoding (decodeLatin1, encodeUtf8)
import Data.Time.Clock (UTCTime)
import Simplex.Messaging.Agent.Store.DB (FromField (..), ToField (..), fromTextField_)
import Simplex.Messaging.Encoding
import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON)
import Simplex.Messaging.Util ((<$?>))
#if defined(dbServerPostgres)
import Data.Text.Encoding (decodeLatin1, encodeUtf8)
import Database.PostgreSQL.Simple.FromField (FromField (..))
import Database.PostgreSQL.Simple.ToField (ToField (..))
import Simplex.Messaging.Agent.Store.Postgres.DB (fromTextField_)
import Simplex.Messaging.Util (eitherToMaybe)
#endif
import Simplex.Messaging.Util (eitherToMaybe, (<$?>))
data QueueInfo = QueueInfo
{ qiSnd :: Bool,
@@ -63,11 +57,9 @@ instance Encoding QueueMode where
'C' -> pure QMContact
_ -> fail "bad QueueMode"
#if defined(dbServerPostgres)
instance FromField QueueMode where fromField = fromTextField_ $ eitherToMaybe . smpDecode . encodeUtf8
instance ToField QueueMode where toField = toField . decodeLatin1 . smpEncode
#endif
$(JQ.deriveJSON (enumJSON $ dropPrefix "Q") ''QSubThread)