1 files changed, 8 insertions, 1 deletions

diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs
index dceb9210..51567b27 100644
--- a/dht/ToxManager.hs
+++ b/dht/ToxManager.hs
@@ -89,6 +89,13 @@ stringToKey_ s = let (xs,ys) = break (==':') s
                                        them <- readMaybe (drop 1 ys)
                                        return $ ToxContact me them
 
+dropExtension :: T.Text -> T.Text
+dropExtension pubname = case T.dropWhileEnd (/='.') pubname of
+    x | T.null x  -> pubname
+      | otherwise -> case T.dropEnd 1 pubname of
+            y | T.null y  -> pubname -- Avoid changing "." to empty string.
+              | otherwise -> y
+
 -- |
 --
 -- These hooks will be invoked in order to connect to *.tox hosts in a user's
@@ -139,7 +146,7 @@ toxman ssvar announcer toxbkts tox presence = ToxManager
     , deactivateAccount      = \k pubname -> do
        dput XMan $ "toxman DECTIVATE (todo) 1 " ++ show pubname
        let ContactInfo{ accounts } = Tox.toxContactInfo tox
-           mpubid = readMaybe $ T.unpack $ T.take 43 pubname
+           mpubid = readMaybe $ T.unpack $ dropExtension pubname
        bStopped <- fmap (fromMaybe Nothing) $ atomically $ do
         forM mpubid $ \pubid -> do
         refs <- do