1 files changed, 24 insertions, 30 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 000583c5..fe639af1 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1231,49 +1231,43 @@ netcrypto
   -> Maybe (Tox.Tox extra2)
   -> String
   -> IO ()
-netcrypto dht selectedKey h roster mbTox keystr | Just DHT{..} <- dht = do
-            case selectedKey of
-                Nothing -> hPutClient h "No key is selected, see k command."
-                Just mypubkey -> do
+netcrypto _ _ h _ Nothing _ =  hPutClient h "Requires Tox enabled."
+netcrypto _ Nothing h _ _ _ =  hPutClient h "No key is selected, see k command."
+netcrypto dht (Just mypubkey) h roster (Just tox) keystr | Just DHT{..} <- dht = do
                     let goParse = either
                                          (\_ -> either (hPutClient h . ("Bad netcrypto target: "++))
                                                  (goTarget . Left)
                                                  (readEither keystr)) -- attempt read as NodeInfo type
                                          (goTarget . Right  . Tox.id2key)
                                          $ readEither keystr -- attempt read as NodeId type
+                    goParse
+  where
                         goTarget (Left userkey_nodeinfo) = do
                             msec <- atomically $ do
                                 fmap userSecret . HashMap.lookup (Tox.key2id mypubkey) <$> readTVar (accounts roster)
-                            case mbTox of
-                                Nothing -> hPutClient h "Requires Tox enabled."
-                                Just tox-> do
-                                    case msec of
-                                        Nothing -> hPutClient h "Error getting secret key"
-                                        Just sec -> do
-                                            let their_pub = Tox.id2key $ Tox.nodeId userkey_nodeinfo
-                                                their_addr = Tox.nodeAddr userkey_nodeinfo
-                                            let acsVar = accounts (Tox.toxContactInfo tox)
-                                            acsmap <- atomically $ readTVar acsVar
-                                            case HashMap.lookup (Tox.key2id mypubkey) acsmap of
-                                                Nothing -> hPutClient h "Unable to find account for selected key"
-                                                Just account -> do
-                                                    now <- getPOSIXTime
-                                                    atomically $ setContactAddr now their_pub their_addr account
-                                                    Tox.netCrypto tox sec their_pub
-                                                    hPutClient h "Handshake sent"
+                            case msec of
+                                Nothing -> hPutClient h "Error getting secret key"
+                                Just sec -> do
+                                    let their_pub = Tox.id2key $ Tox.nodeId userkey_nodeinfo
+                                        their_addr = Tox.nodeAddr userkey_nodeinfo
+                                    let acsVar = accounts (Tox.toxContactInfo tox)
+                                    acsmap <- atomically $ readTVar acsVar
+                                    case HashMap.lookup (Tox.key2id mypubkey) acsmap of
+                                        Nothing -> hPutClient h "Unable to find account for selected key"
+                                        Just account -> do
+                                            now <- getPOSIXTime
+                                            atomically $ setContactAddr now their_pub their_addr account
+                                            Tox.netCrypto tox sec their_pub
+                                            hPutClient h "Handshake sent"
                         goTarget (Right their_pub) = do
                             msec <- atomically $ do
                                 ks <- map swap <$> myKeyPairs roster
                                 return $ Data.List.lookup mypubkey ks
-                            case mbTox of
-                                Nothing -> hPutClient h "Requires Tox enabled."
-                                Just tox-> do
-                                    case msec of
-                                        Nothing -> hPutClient h "Error getting secret key"
-                                        Just sec -> do
-                                            Tox.netCrypto tox sec their_pub
-                                            hPutClient h "Handshake sent"
-                    goParse
+                            case msec of
+                                Nothing -> hPutClient h "Error getting secret key"
+                                Just sec -> do
+                                    Tox.netCrypto tox sec their_pub
+                                    hPutClient h "Handshake sent"
 
 readExternals :: (ni -> SockAddr) -> [TVar (BucketList ni)] -> IO [SockAddr]
 readExternals nodeAddr vars = do