1 files changed, 15 insertions, 0 deletions

diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index dc600db7..97faa942 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -13,6 +13,7 @@
 {-# LANGUAGE LambdaCase                 #-}
 {-# LANGUAGE PatternSynonyms            #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
+{-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TupleSections              #-}
 {- LANGUAGE TypeApplications           -}
 module Network.Tox.NodeId
@@ -118,6 +119,19 @@ packPublicKey ws = BA.allocAndFreeze (8 * length ws) $
 -- convenient for short-circuiting xor/distance comparisons.  The PublicKey
 -- format is convenient for encryption.
 data NodeId = NodeId [Word64] !(Maybe PublicKey)
+ deriving Data
+
+instance Data PublicKey where
+  -- Data a => (forall d b . Data d => c (d -> b) -> d -> c b) -> (forall g . g -> c g) -> a -> c a
+  gfoldl f z txt = z (throwCryptoError . publicKey) `f` (BA.convert txt :: ByteString)
+  toConstr _     = error "Crypto.PubKey.Curve25519.toConstr"
+  gunfold _ _    = error "Crypto.PubKey.Curve25519.gunfold"
+#if MIN_VERSION_base(4,2,0)
+  dataTypeOf _   = mkNoRepType "Crypto.PubKey.Curve25519.PublicKey"
+#else
+  dataTypeOf _   = mkNorepType "Crypto.PubKey.Curve25519.PublicKey"
+#endif
+
 
 instance Eq NodeId where
  (NodeId ws _) == (NodeId xs _)
@@ -586,6 +600,7 @@ parseNoSpamJID jid = do
         '$' : b64digits       -> solveBase64NoSpamID b64digits pub
         '0' : 'x' : hexdigits -> do nospam <- readEither ('0':'x':hexdigits)
                                     return $ NoSpamId nospam pub
+        _ -> Left "Missing nospam."
 
 solveBase64NoSpamID :: String -> PublicKey -> Either String NoSpamId
 solveBase64NoSpamID b64digits pub = do