2 files changed, 20 insertions, 10 deletions

diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index 0fd49c2b..89fd420f 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -583,6 +583,11 @@ data OutBoundMessage = OutBoundPresence Presence | PresenceProbe JID
 
 newServerConnections = newTVar Map.empty
 
+data CachedMessages = CachedMessages 
+    { presences :: Map JID JabberShow
+    , probes :: Set JID
+    }
+
 connect_to_server chan peer = (>> return ()) . runMaybeT $ do
     let port = 5269 :: Int
 
@@ -590,7 +595,7 @@ connect_to_server chan peer = (>> return ()) . runMaybeT $ do
 
     -- We'll cache Presence notifications until the socket
     -- is ready.
-    cached <- liftIO $ newIORef Map.empty
+    cached <- liftIO $ newIORef (CachedMessages Map.empty Set.empty)
 
     sock <- MaybeT . fix $ \loop -> do
         e <- atomically $ orElse
@@ -598,15 +603,16 @@ connect_to_server chan peer = (>> return ()) . runMaybeT $ do
                 (fmap Left  $ readTChan chan)
         case e of
             Left (OutBoundPresence (Presence jid Offline)) -> do
-                cached_map <- readIORef cached
-                writeIORef cached (Map.delete jid cached_map)
+                cache <- readIORef cached
+                writeIORef cached (cache { presences=Map.delete jid . presences $ cache })
                 loop
             Left (OutBoundPresence p@(Presence jid st)) -> do
-                cached_map <- readIORef cached
-                writeIORef cached (Map.insert jid st cached_map)
+                cache <- readIORef cached
+                writeIORef cached (cache { presences=Map.insert jid st . presences $ cache })
                 loop
             Left (PresenceProbe jid) -> do
-                liftIO $ putStrLn "Connection not ready, Discarding Presence Probe..."
+                cache <- readIORef cached
+                writeIORef cached (cache { probes=Set.insert jid . probes $ cache })
                 loop
             {-
             Left event -> do
@@ -619,8 +625,9 @@ connect_to_server chan peer = (>> return ()) . runMaybeT $ do
         h <- socketToHandle sock ReadWriteMode
         hSetBuffering h NoBuffering
         let snk = packetSink h
-        cache <- fmap Map.assocs . readIORef $ cached
-        writeIORef cached Map.empty -- hint garbage collector: we're done with this
+        cache <- readIORef $ cached
+        -- hint garbage collector: we're done with this...
+        writeIORef cached (CachedMessages Map.empty Set.empty) 
         handleOutgoingToPeer (restrictSocket sock) cache chan snk
 
 
@@ -641,9 +648,12 @@ toPeer sock cache chan = do
     let -- log     = liftIO . L.putStrLn . ("(>P) " <++>)
         send xs = yield xs >> prettyPrint ">P: " xs
     send greetPeer
-    forM_ cache $ \(jid,st) -> do
+    forM_ (Map.assocs . presences $ cache) $ \(jid,st) -> do
         r <- lift $ xmlifyPresenceForPeer sock (Presence jid st)
         send r
+    forM_ (Set.toList . probes $ cache) $ \jid -> do
+        -- TODO: send probe
+        return ()
     fix $ \loop -> do
         event <- lift . atomically $ readTChan chan
         case event of
@@ -651,6 +661,7 @@ toPeer sock cache chan = do
             r <- lift $ xmlifyPresenceForPeer sock p
             send r
           PresenceProbe jid  -> do
+            -- TODO: send probe
             liftIO $ putStrLn ("Connection ready, PresenceProbe " ++ show jid ++ " (NOT IMPLEMENTED)")
         loop
     send goodbyePeer
diff --git a/Presence/main.hs b/Presence/main.hs
index fa4a98c1..2c0a6cfb 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -246,7 +246,6 @@ sendProbes state jid = do
         jids <- maybe (return Set.empty) readTVarIO mjids
         let noinfo = Set.notMember buddy jids
         when noinfo $ do
-        -- TODO ... sendMessage
         sendMessage (outGoingConnections state) (PresenceProbe buddy) (peer buddy) 
         return ()