Refactoring.

1 files changed, 6 insertions, 13 deletions

diff --git a/dht/examples/dhtd.hs b/dht/examples/dhtd.hs
index 3e9f8ff5..adfe0d69 100644
--- a/dht/examples/dhtd.hs
+++ b/dht/examples/dhtd.hs
@@ -63,6 +63,7 @@ import System.Posix.Signals
 import Announcer
 import Announcer.Tox
 import ToxManager
+import Codec.AsciiKey256
 import Crypto.Tox -- (zeros32,SecretKey,PublicKey, generateSecretKey, toPublic, encodeSecret, decodeSecret, userKeys)
 import DebugUtil
 import Network.UPNP as UPNP
@@ -1302,27 +1303,19 @@ onNewToxSession sv ssvar invc ContactInfo{accounts} addrTox netcrypto = do
     return ()
 
 selectManager :: Maybe (t -> ToxManager clientAddress) -> Manager Tcp.TCPStatus T.Text -> T.Text -> Manager Pending T.Text
-selectManager mtman tcp profile = case T.splitAt (T.length profile - 4) profile of
-    (k,".tox") | Just tman <- mtman
+selectManager mtman tcp profile = case stripSuffix ".tox" profile of
+    Just k | Just tman <- mtman
                -> let -- The following error call is safe because the toxConnections field
                       -- does not make use of the PresenceState passed to tman.
                       tox = toxConnections $ tman $ error "PresenseState"
-                      tkey them = do
+                      tkey them0 = do
                         me <- readMaybe (T.unpack k)
-                        them <- case T.splitAt 52 them of
-                            (them0,".tox") -> readMaybe (T.unpack them0)
-                            _              -> case T.splitAt 43 them of
-                                (them0,".tox") -> readMaybe (T.unpack them0)
-                                _              -> Nothing
+                        them <- stripSuffix ".tox" them0 >>= readMaybe . T.unpack
                         return (Tox.ToxContact me them)
                   in Manager
                     { resolvePeer = \themhost -> do
                         r <- fromMaybe (return []) $ do
-                            themT <- case T.splitAt 52 themhost of
-                                (ts,".tox") -> Just ts
-                                _           -> case T.splitAt 43 themhost of
-                                    (ts,".tox") -> Just ts
-                                    _           -> Nothing
+                            themT <- stripSuffix ".tox" themhost
                             them <- readMaybe $ T.unpack themT
                             me <- readMaybe $ T.unpack k
                             let contact = Tox.ToxContact me them