Tox-XMPP: Switched to z-base32 domain names.

1 files changed, 10 insertions, 4 deletions

diff --git a/dht/examples/dhtd.hs b/dht/examples/dhtd.hs
index 5f0eead8..3e9f8ff5 100644
--- a/dht/examples/dhtd.hs
+++ b/dht/examples/dhtd.hs
@@ -1302,21 +1302,27 @@ 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 43 profile of
+selectManager mtman tcp profile = case T.splitAt (T.length profile - 4) profile of
     (k,".tox") | 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
                         me <- readMaybe (T.unpack k)
-                        them <- case T.splitAt 43 them of
+                        them <- case T.splitAt 52 them of
                             (them0,".tox") -> readMaybe (T.unpack them0)
-                            _              -> Nothing
+                            _              -> case T.splitAt 43 them of
+                                (them0,".tox") -> readMaybe (T.unpack them0)
+                                _              -> Nothing
                         return (Tox.ToxContact me them)
                   in Manager
                     { resolvePeer = \themhost -> do
                         r <- fromMaybe (return []) $ do
-                            (themT,".tox") <- Just $ T.splitAt 43 themhost
+                            themT <- case T.splitAt 52 themhost of
+                                (ts,".tox") -> Just ts
+                                _           -> case T.splitAt 43 themhost of
+                                    (ts,".tox") -> Just ts
+                                    _           -> Nothing
                             them <- readMaybe $ T.unpack themT
                             me <- readMaybe $ T.unpack k
                             let contact = Tox.ToxContact me them