1 files changed, 2 insertions, 8 deletions

diff --git a/dht/ToxManager.hs b/dht/ToxManager.hs
index 51567b27..408b12d2 100644
--- a/dht/ToxManager.hs
+++ b/dht/ToxManager.hs
@@ -9,6 +9,7 @@ module ToxManager where
 import Announcer
 import Announcer.Tox
 import ClientState
+import Codec.AsciiKey256
 import ConfigFiles
 import Control.Arrow
 import Control.Concurrent.STM
@@ -89,13 +90,6 @@ 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
@@ -146,7 +140,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 $ dropExtension pubname
+           mpubid = stripSuffix ".tox" pubname >>= readMaybe . T.unpack
        bStopped <- fmap (fromMaybe Nothing) $ atomically $ do
         forM mpubid $ \pubid -> do
         refs <- do