aboutsummaryrefslogtreecommitdiff
path: root/src/Ssb/Peer/RPC
diff options
context:
space:
mode:
authorCypher <cypher@server.ky>2022-05-03 15:05:40 -0500
committerCypher <cypher@server.ky>2022-05-03 15:05:40 -0500
commit1a10c09d6150dbc9e8a1718b710252cb7b38b776 (patch)
tree34139f56373ad9e93d267543166c0c3da0f434d0 /src/Ssb/Peer/RPC
parent0732fbc8925efb9753b543d721ea845b9b4f338f (diff)
downloadssb-haskell-1a10c09d6150dbc9e8a1718b710252cb7b38b776.tar.xz
use stack lts-18.8
Update text handling to keep uptodate with changes with string conversion, using 'encodeUtf' and 'decodeUtf' where necessary. One update uses an odd encoding to and from JSON, which must be looked at later.
Diffstat (limited to 'src/Ssb/Peer/RPC')
-rw-r--r--src/Ssb/Peer/RPC/Room.hs3
-rw-r--r--src/Ssb/Peer/RPC/WhoAmI.hs2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Ssb/Peer/RPC/Room.hs b/src/Ssb/Peer/RPC/Room.hs
index 1f53cf0..7be7d2c 100644
--- a/src/Ssb/Peer/RPC/Room.hs
+++ b/src/Ssb/Peer/RPC/Room.hs
@@ -280,7 +280,8 @@ instance RPC.Handler Room where
-- should decode request
serve h (RPC.Endpoint ["tunnel", "connect"] RPC.Duplex) args stream = do
let args' =
- decodeJSON (toS $ Aeson.encode args) :: Either
+ -- TODO: why encode to JSON then decode from JSON redundantly?
+ decodeJSON (encodeJSON args) :: Either
Text
[ConnectRequest]
case args' of
diff --git a/src/Ssb/Peer/RPC/WhoAmI.hs b/src/Ssb/Peer/RPC/WhoAmI.hs
index be979fc..c92c56c 100644
--- a/src/Ssb/Peer/RPC/WhoAmI.hs
+++ b/src/Ssb/Peer/RPC/WhoAmI.hs
@@ -7,7 +7,7 @@
module Ssb.Peer.RPC.WhoAmI where
-import Protolude hiding ( Identity )
+import Protolude hiding ( Handler, Identity )
import Data.Aeson as Aeson (FromJSON,ToJSON)
import qualified Ssb.Identity as Ssb