1 files changed, 19 insertions, 9 deletions

diff --git a/ToxToXMPP.hs b/ToxToXMPP.hs
index 9391a232..5495f5ad 100644
--- a/ToxToXMPP.hs
+++ b/ToxToXMPP.hs
@@ -100,11 +100,21 @@ key2jid nospam key = T.pack $ show $ NoSpamId nsp key
     nlo = fromIntegral (0x0FFFF .&. nospam) :: Word16
     nhi = fromIntegral (0x0FFFF .&. (nospam `shiftR` 16)) :: Word16
 
+type JabberClients = Map.Map ConnectionKey PerClient
+
+data PerClient = PerClient
+    {
+    }
+
+initPerClient :: STM PerClient
+initPerClient = do
+    return PerClient {}
+
 data ToxToXMPP = ToxToXMPP
     { txAnnouncer :: Announcer
-    , txAccount   :: Account
+    , txAccount   :: Account JabberClients
     , txPresence  :: PresenceState
-    , txTox       :: Tox
+    , txTox       :: Tox JabberClients
     }
 
 dispatch :: ToxToXMPP -> ContactEvent -> IO ()
@@ -119,8 +129,8 @@ dispatch tx (OnionRouted  theirkey (OnionFriendRequest fr) ) = do
                   , txAccount   = acnt
                   , txPresence  = st } = tx
     k2c <- atomically $ do
-        refs <- readTVar (clientRefs acnt)
-        k2c <- Map.filterWithKey (\k _ -> k `Set.member` refs) <$> readTVar (keyToChan st)
+        refs <- readTVar (accountExtra acnt)
+        k2c <- Map.filterWithKey (\k _ -> isJust $ k `Map.lookup` refs) <$> readTVar (keyToChan st)
         clients <- readTVar (clients st)
         return $ Map.intersectionWith (,) k2c clients
     -- TODO: Below we're using a hard coded default as their jabber user id.
@@ -204,7 +214,7 @@ stopConnecting ToxToXMPP{txAnnouncer=announcer,txAccount=acnt} them = do
     akey <- akeyDHTKeyShare announcer me them
     cancel announcer akey
 
-forkAccountWatcher :: Account -> Tox -> PresenceState -> Announcer -> IO ThreadId
+forkAccountWatcher :: Account JabberClients -> Tox JabberClients -> PresenceState -> Announcer -> IO ThreadId
 forkAccountWatcher acc tox st announcer = forkIO $ do
     myThreadId >>= flip labelThread ("tox-xmpp:"
                                       ++ show (key2id $ toPublic $ userSecret acc))
@@ -220,13 +230,13 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
     forM_ (HashMap.toList cs) $ \(them,c) -> do
         startConnecting0 tx (id2key them) c
 
-    -- Loop endlessly until clientRefs is null.
+    -- Loop endlessly until accountExtra is null.
     fix $ \loop -> do
     mev <- atomically $
             (Just <$> readTChan chan)
             `orElse` do
-                refs <- readTVar $ clientRefs acc
-                check $ Set.null refs
+                refs <- readTVar $ accountExtra acc
+                check $ Map.null refs
                 return Nothing
 
     forM_ mev $ \ev -> dispatch tx ev >> loop
@@ -236,7 +246,7 @@ forkAccountWatcher acc tox st announcer = forkIO $ do
         stopConnecting tx (id2key them)
 
 
-toxQSearch :: Tox.Tox -> Search Tox.NodeId (IP, PortNumber) Nonce32 Tox.NodeInfo Tox.Rendezvous
+toxQSearch :: Tox extra -> Search Tox.NodeId (IP, PortNumber) Nonce32 Tox.NodeInfo Tox.Rendezvous
 toxQSearch tox = Tox.toxidSearch (Tox.onionTimeout tox) (Tox.toxCryptoKeys tox) (Tox.toxOnion tox)
 
 toxAnnounceInterval :: POSIXTime