Improved nid command JID parsing.

3 files changed, 22 insertions, 4 deletions

diff --git a/Presence/Util.hs b/Presence/Util.hs
index 8d9a9494..a934cad7 100644
--- a/Presence/Util.hs
+++ b/Presence/Util.hs
@@ -30,7 +30,7 @@ splitJID bjid =
         server = head ys
         name = case xs of
                 (n:s:_) -> Just n
-                (s:_)   -> Nothing
+                _       -> Nothing
         rsrc = case ys of
                 (s:_:_) -> Just $ last ys
                 _       -> Nothing
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index ea94b7ce..58a69c6a 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -505,8 +505,13 @@ clientSession s@Session{..} sock cnum h = do
                                                 Left ej -> if elem '@' s
                                                             then "Error: " ++ ej
                                                             else "Error: " ++ e
-                                                Right jid -> show jid
-                                    Right nid -> show nid ++ " nospam:" ++ drop 64 s
+                                                Right jid -> unlines [ show jid
+                                                                     , Tox.noSpamIdToHex jid ]
+                                    Right nid -> let nspam = drop 64 s
+                                                     jid :: Maybe Tox.NoSpamId
+                                                     jid = readMaybe $ '0':'x':nspam ++ "@" ++ show nid ++ ".tox"
+                                                 in unlines [ maybe "" show jid
+                                                            , show nid ++ " nospam:" ++ nspam ]
                             Right nid -> show nid
 
         ("lan", _)  -> cmd0 $ do
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index dab1b14a..f3013142 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -29,6 +29,7 @@ module Network.Tox.NodeId
     , sampleNodeId
     , NoSpam(..)
     , NoSpamId(..)
+    , noSpamIdToHex
     , parseNoSpamId
     , nospam64
     , verifyChecksum) where
@@ -520,6 +521,16 @@ verifyChecksum _ _ = return () -- TODO
 data NoSpamId = NoSpamId NoSpam PublicKey
  deriving (Eq,Ord)
 
+noSpamIdToHex :: NoSpamId -> String
+noSpamIdToHex (NoSpamId nspam pub) = C8.unpack (Base16.encode $ BA.convert pub)
+                                     ++ nospam16 nspam
+
+nospam16 :: NoSpam -> String
+nospam16 (NoSpam w32 Nothing) = n ++ "????"
+    where n = take 8 $ nospam16 (NoSpam w32 (Just 0))
+nospam16 (NoSpam w32 (Just w16)) = C8.unpack $ Base16.encode $ runPut $ do
+    put w32
+    put w16
 
 nospam64 :: NoSpam -> String
 nospam64 (NoSpam w32 Nothing) = n ++ "???"
@@ -549,7 +560,9 @@ parseNoSpamId spec | Text.length spec == 76
 
 parseNoSpamJID :: Text -> Either String NoSpamId
 parseNoSpamJID jid = do
-    (Just u,h,_) <- Right $ splitJID jid
+    (u,h) <- maybe (Left "Invalid JID.") Right
+                $ let (mu,h,_) = splitJID jid
+                  in fmap (, h) mu
     base64 <- case splitAt 43 $ Text.unpack h of
                 (base64,".tox") -> Right base64
                 _               -> Left "Hostname should be 43 base64 digits followed by .tox."