Stop announcing toxid when xmpp clients disconnect.

2 files changed, 30 insertions, 8 deletions

diff --git a/Announcer.hs b/Announcer.hs
index 72d70a1e..c66d26b4 100644
--- a/Announcer.hs
+++ b/Announcer.hs
@@ -40,6 +40,9 @@ import qualified GHC.Generics as Generics
 newtype AnnounceKey = AnnounceKey ByteString
  deriving (Hashable,Ord,Eq)
 
+instance Show AnnounceKey where
+    show (AnnounceKey bs) = "AnnounceKey " ++ show (Char8.unpack bs)
+
 packAnnounceKey :: Announcer -> String -> STM AnnounceKey
 packAnnounceKey _ = return . AnnounceKey . Char8.pack
 
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 27e3c4ef..b24a90fb 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1453,10 +1453,12 @@ toxman announcer toxbkts tox presence = ToxManager
 
             forkAccountWatcher acnt tox presence
             return ()
+
     , deactivateAccount      = \k pubname -> do
-       bStopped <- fmap (fromMaybe False) $ atomically $ do
-        let ContactInfo{ accounts } = Tox.toxContactInfo tox
-            mpubid = readMaybe $ T.unpack $ T.take 43 pubname
+       hPutStrLn stderr $ "toxman DECTIVATE (todo) 1 " ++ show pubname
+       let ContactInfo{ accounts } = Tox.toxContactInfo tox
+           mpubid = readMaybe $ T.unpack $ T.take 43 pubname
+       bStopped <- fmap (fromMaybe Nothing) $ atomically $ do
         forM mpubid $ \pubid -> do
         refs <- do
             macnt <- HashMap.lookup pubid <$> readTVar accounts
@@ -1464,13 +1466,30 @@ toxman announcer toxbkts tox presence = ToxManager
             forM_ macnt $ \acnt -> do
                 modifyTVar' (clientRefs acnt) $ Set.delete k
             return rs
-        if (not $ Set.null $ refs Set.\\ Set.singleton k) then do
-            --   Stop recurring announce.
+        if (Set.null $ refs Set.\\ Set.singleton k) then do
+            --   TODO
             --   If this is the last reference to a non-connected contact:
             --      Stop the recurring search for that contact
-            return True
-        else return False
-       when bStopped $ hPutStrLn stderr $ "toxman DECTIVATE (todo) " ++ show pubname
+            --
+            -- Stop recurring announce.
+            fmap Just $ forM toxbkts $ \(nm,bkts) -> do
+                akey <- packAnnounceKey announcer (nm ++ "id:" ++ show pubid)
+                return (akey,bkts)
+        else return Nothing
+       forM_ bStopped $ \kbkts -> do
+           hPutStrLn stderr $ "toxman DECTIVATE (todo) 3 " ++ show pubname
+           let Just pubid = mpubid
+               pub        = Tox.id2key pubid
+           forM_ kbkts $ \(akey,bkts) -> do
+                cancel announcer
+                     akey
+                     (AnnounceMethod (toxQSearch tox)
+                                     (Right $ toxAnnounceSendData tox)
+                                     bkts
+                                     pubid
+                                     toxAnnounceInterval)
+                     pub
+
     , setToxConnectionPolicy = \me them p -> do
        hPutStrLn stderr $ "toxman ConnectionPolicy " ++ show (me,them,p)
        case p of