3 files changed, 11 insertions, 3 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index eaf908f8..f713b926 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -572,7 +572,11 @@ clientSession s@Session{..} sock cnum h = do
                             Left e    ->
                                 -- HACK: split nospam from hex toxid
                                 case dhtParseId (take 64 s) of
-                                    Left e -> "Error: " ++ e
+                                    Left e -> case Tox.parseNoSpamId $ T.pack s of
+                                                Left ej -> if elem '@' s
+                                                            then "Error: " ++ ej
+                                                            else "Error: " ++ e
+                                                Right jid -> show jid
                                     Right nid -> show nid ++ " nospam:" ++ drop 64 s
                             Right nid -> show nid
 
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 2f3a2bb1..1f79d1a5 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -548,7 +548,9 @@ parseNoSpamId spec | Text.length spec == 76
 parseNoSpamJID :: Text -> Either String NoSpamId
 parseNoSpamJID jid = do
     (Just u,h,_) <- Right $ splitJID jid
-    (base64,".tox") <- Right $ splitAt 43 $ Text.unpack h
+    base64 <- case splitAt 43 $ Text.unpack h of
+                (base64,".tox") -> Right base64
+                _               -> Left "Hostname should be 43 base64 digits followed by .tox."
     pub <- id2key <$> readEither base64
     let ustr = Text.unpack u
     '$' : b64digits <- Right ustr -- TODO: support 0x prefix also.
diff --git a/todo.txt b/todo.txt
index 7cf1b50b..9659e78a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,3 +1,5 @@
+tox: tcp relay
+
 bug: local IPv6 addresses are occurring in the IPv4 tox routing table.
 
 xmpp: xmpp-added roster keys are not in TransportCrypto and unusable from TOx.Crypto.Handlers.
@@ -6,7 +8,7 @@ xmpp: handle tox-friends in roster.
 
 tox: Add fallback trials to cookie response in case response is from another address than request.
 
-ui: Online help.
+ui: Online help.  Document confusing "friend" and "dhtkey" methods.
 
 ui: Explicit routing table node deletion. "forget" command.