WIP: Deliver friend-request to xmpp client.

1 files changed, 9 insertions, 7 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 60d60258..78090794 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1216,23 +1216,24 @@ toxAnnounceInterval = 15
 --
 -- These hooks will be invoked in order to connect to *.tox hosts in a user's
 -- XMPP roster.
-toxman :: Announcer -> [(String,TVar (BucketList Tox.NodeInfo))] -> Tox.Tox -> ToxManager ConnectionKey
-toxman announcer toxbkts tox = ToxManager
+toxman :: Announcer -> [(String,TVar (BucketList Tox.NodeInfo))] -> Tox.Tox -> PresenceState -> ToxManager ConnectionKey
+toxman announcer toxbkts tox presence = ToxManager
     { activateAccount        = \k pubname seckey -> do
         hPutStrLn stderr $ "toxman ACTIVATE " ++ show (Tox.key2id $ toPublic seckey)
         let ContactInfo{ accounts } = Tox.toxContactInfo tox
             pub = toPublic seckey
             pubid = Tox.key2id pub
-        newlyActive <- atomically $ do
+        (mcon,newlyActive) <- atomically $ do
             macnt <- HashMap.lookup pubid <$> readTVar accounts
             acnt <- maybe (newAccount seckey) return macnt
             rs <- readTVar $ clientRefs acnt
             writeTVar (clientRefs acnt) $! Set.insert k rs
             modifyTVar accounts (HashMap.insert pubid acnt)
+            mcon <- fmap ((,) acnt) . Map.lookup k <$> readTVar (keyToChan presence)
             if not (Set.null rs)
-                then return []
+                then return (mcon,[])
                 else do
-                    forM toxbkts $ \(nm,bkts) -> do
+                    fmap ((,) mcon) $ forM toxbkts $ \(nm,bkts) -> do
                         akey <- packAnnounceKey announcer (nm ++ "id:" ++ show pubid)
                         return (akey,bkts)
         forM_ newlyActive $ \(akey,bkts) -> do
@@ -1246,8 +1247,8 @@ toxman announcer toxbkts tox = ToxManager
                                      pubid
                                      toxAnnounceInterval)
                      pub
-            --
-            -- Schedule recurring search for all non-connected contacts.
+
+            forM_ mcon $ \(acnt,conn) -> forkAccountWatcher acnt tox conn
             return ()
     , deactivateAccount      = \k pubname -> do
        bStopped <- fmap (fromMaybe False) $ atomically $ do
@@ -1628,6 +1629,7 @@ main = runResourceT $ liftBaseWith $ \resT -> do
                             [ lookupBkts "tox4" toxdhts
                             , lookupBkts "tox6" toxdhts
                             ]
+
             state     <- newPresenceState cw (toxman announcer toxbkts <$> mbtox) serverVar
 
             sv    <- resT $ xmppServer (presenceHooks state (verbosity opts) (Just cport) (Just sport))