1 files changed, 18 insertions, 14 deletions

diff --git a/dht/Presence/Presence.hs b/dht/Presence/Presence.hs
index a09a517d..dcc76c5b 100644
--- a/dht/Presence/Presence.hs
+++ b/dht/Presence/Presence.hs
@@ -251,7 +251,11 @@ chooseResourceName state k (Remote addr) clientsNameForMe desired = do
     flgs <- atomically $ newTVar 0
     profile <- fmap (fromMaybe ".")
         $ forM ((,) <$> clientsNameForMe <*> toxManager state) $ \(wanted_profile0,toxman) ->
-        case Text.splitAt 43 wanted_profile0 of
+        case splitLast4 wanted_profile0 of
+            ("*",".tox") -> do
+                dput XMisc $ "TODO: Match single tox key profile or generate first."
+                -- TODO: Match single tox key profile or generate first.
+                _todo
             (pub,".tox") -> do
                 cdir <- ConfigFiles.configPath (L.fromChunks [Text.encodeUtf8 user]) "." ""
 #if !MIN_VERSION_directory(1,2,5)
@@ -274,10 +278,6 @@ chooseResourceName state k (Remote addr) clientsNameForMe desired = do
                             -- fall back to the Unix account login.
                             dput XMisc "failed to find tox secret"
                             return "."
-            ("*.tox","") -> do
-                dput XMisc $ "TODO: Match single tox key profile or generate first."
-                -- TODO: Match single tox key profile or generate first.
-                _todo
             _ -> return "."
     let client = ClientState { clientResource = maybe "fallback" id mtty
                              , clientUser     = user
@@ -361,7 +361,7 @@ rosterGetStuff what state k = forClient state k (return [])
       PresenceState { server = sv } -> do
         let conns = manager state $ clientProfile client
         -- Grok peers to associate with from the roster:
-        let isTox = do (me  , ".tox") <- Just $ Text.splitAt 43 (clientProfile client)
+        let isTox = do (me  , ".tox") <- Just $ splitLast4 (clientProfile client)
                        return me
             noToxUsers (u,h,r)
                 | Text.isSuffixOf ".tox" h = unsplitJID (Nothing,h,r)
@@ -373,8 +373,8 @@ rosterGetStuff what state k = forClient state k (return [])
             let policySetter = fromMaybe (Connection.setPolicy conns host) $ do
                     isTox
                     toxman <- toxManager state
-                    (them, ".tox") <- Just $ Text.splitAt 43 host
-                    meid <- readMaybe $ Text.unpack $ Text.take 43 (clientProfile client)
+                    (them, ".tox") <- Just $ splitLast4 host
+                    meid <- readMaybe $ Text.unpack $ Text.dropEnd 4 (clientProfile client)
                     themid <- readMaybe $ Text.unpack them
                     return $ Connection.setPolicy (toxConnections toxman)
                                                   (ToxContact meid themid)
@@ -547,7 +547,7 @@ eofConn state saddr cdta = do
         Right (k,_) -> do
             forClient state k (return ()) $ \client -> do
             forM_ (toxManager state) $ \toxman -> do
-                case Text.splitAt 43 (clientProfile client) of
+                case splitLast4 (clientProfile client) of
                     (pub,".tox") -> deactivateAccount toxman k (clientProfile client)
                     _            -> return ()
             stanza <- makePresenceStanza "jabber:server" Nothing Offline
@@ -665,12 +665,12 @@ deliverMessage state fail msg =
                          -- In case the client sends us a lower-cased version of the base64
                          -- tox key hostname, we resolve it by comparing it with roster entries.
                          xs <- getBuddiesAndSolicited state (clientProfile client) $ \case
-                            rh | (_,".tox") <- Text.splitAt 43 rh
+                            rh | (_,".tox") <- splitLast4 rh
                                , Text.toLower rh == Text.toLower th
                                -> return True
                             _ -> return False
                          fmap join $ forM (listToMaybe xs) $ \(_,rmu,_,h) -> do
-                             let (them,_) = Text.splitAt 43 h
+                             let (them,_) = splitLast4 h
                              maddr <- resolveToxPeer toxman me them
                              let to' = unsplitJID (mu,h,rsc)
                              return $ fmap (to',) maddr
@@ -1168,17 +1168,21 @@ clientSubscriptionRequest state fail k stanza chan = do
                                      (connChan con)
         let policySetter = fromMaybe (Connection.setPolicy conns h) $ do
                 (toxman,_,_) <- weAreTox state client h
-                meid <- readMaybe $ Text.unpack $ Text.take 43 (clientProfile client)
+                meid <- readMaybe $ Text.unpack $ case splitLast4 (clientProfile client) of
+                            (h,".tox") -> h
+                            _          -> clientProfile client
                 themid <- readMaybe $ Text.unpack h
                 Just $ Connection.setPolicy (toxConnections toxman) (ToxContact meid themid)
         -- Add peer if we are not already associated ...
         policySetter Connection.TryingToConnect
 
+splitLast4 h = Text.splitAt (Text.length h - 4) h
+
 weAreTox :: PresenceState stat -> ClientState -> Text -> Maybe (ToxManager ClientAddress,Text{- me -},Text{- them -})
 weAreTox state client h = do
     toxman <- toxManager state
-    (me  , ".tox") <- Just $ Text.splitAt 43 (clientProfile client)
-    (them, ".tox") <- Just $ Text.splitAt 43 h
+    (me  , ".tox") <- Just $ splitLast4 (clientProfile client)
+    (them, ".tox") <- Just $ splitLast4 h
     return (toxman,me,them)
 
 resolvedFromRoster