3 files changed, 23 insertions, 2 deletions

diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index 6dbc64b0..2c01d456 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -610,8 +610,10 @@ handlePeer st src snk = do
 
 handlePeerPresence session stanza False = do
     -- Offline
+    liftIO . debugStr $ "PEER-OFFLINE: "++show stanza
     withJust (lookupAttrib "from" (tagAttrs stanza)) $ \jid -> do
     peer_jid <- liftIO $ parseAddressJID (textToByteString jid)
+    liftIO . debugStr $ "PEER-OFFLINE-JID: "++show peer_jid
     liftIO $ announcePresence session (Presence peer_jid Offline)
 handlePeerPresence session stanza True = do
     -- online (Available or Away)
@@ -632,6 +634,7 @@ handlePeerPresence session stanza True = do
         toStat "chat" = Available
 
     stat' <- parseChildren Available
+    liftIO . debugStr $ "announcing peer online: "++show (pjid,stat')
     liftIO $ announcePresence session (Presence pjid stat')
     log $ bshow (Presence pjid stat')
 
@@ -683,6 +686,8 @@ handlePresenceProbe session stanza = do
                 when (peer sub == discardPort (peerAddress session)) $ do
                 ps <- userStatus session user
                 -- todo: Consider making this a directed presence
+                forM_ ps $ \p ->  do
+                    debugStr ("PROBE-REPLY: "++show p)
                 mapM_ (sendPeerMessage session . OutBoundPresence) ps
     return ()
 
diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index 84da2fed..8d0bd242 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -100,6 +100,9 @@ data JabberShow = Offline
                 | Available
  deriving (Prelude.Show,Enum,Ord,Eq,Read)
 
+withResource (JID n p _) rsc = JID n p rsc
+
+
 data Presence = Presence JID JabberShow
  deriving Prelude.Show
 
diff --git a/Presence/main.hs b/Presence/main.hs
index ef6a0e66..dedd546a 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -227,9 +227,14 @@ instance JabberClientSession ClientSession where
             debugL $ "forCachedPresence jids = "<++> bshow jids
             withJust (splitResource buddy) $ \(buddyU,_) -> do
             forM_ (Set.toList . MM.lookup buddyU $ jids) $ \(rsc,status) -> do
-            let p = Presence buddy status
+            let p = Presence (buddy `withResource` Just rsc) status
             debugL $ "cached presence: " <++> bshow p
             action p
+        -- forCachedPresence jids = MM (fromList 
+        --  [(JabberUser (Chunk "joe" Empty) (RemotePeer [fde3:6df:8be1:81ef:8bae:a0df:9c5d:5]:0)
+        --   ,fromList [(Chunk "tty7" Empty,Available)])])
+        -- cached presence: Presence joe@[fde3:6df:8be1:81ef:8bae:a0df:9c5d:5] Available
+
 
     sendPending s = do
         jid <- getJID s 
@@ -380,9 +385,11 @@ instance JabberPeerSession PeerSession where
         let offline jid = Presence jid Offline
         unrefFromMap (remoteUsers . peer_global $ session) (peer_name session)
             $ do
+                debugStr ("unrefFromMap!")
                 js <- fmap (MM.toAscList) (readTVarIO . announced $ session)
                 forM_ js $ \(u,rs) -> do
                 forM_ (Set.toList rs) $ \(rsc,_) -> do
+                debugStr ("Annoucing offline: "++show (offline $ unsplitResource u (Just rsc)))
                 announcePresence session . offline $ unsplitResource u (Just rsc)
 
     peerSessionFactory session = PeerSessions (peer_global session)
@@ -564,7 +571,13 @@ unrefFromMap tvar key finalizer = do
         omap <- readTVar tvar
         let (r,omap') = Map.updateLookupWithKey unref key omap
         writeTVar tvar omap'
-        return (isNothing r)
+        -- updateLookupWithKey
+        -- The function returns changed value, if it is updated. 
+        -- Returns the original key value if the map entry is deleted. 
+        -- GAAAHGAFHASD:LFKJDSA:LKFJPOFEIWE:FLJF!#@!$@#!
+        -- FUCK YOU Data.Map
+        -- Guess I have to do another pointless logarithmic lookup.
+        return (isNothing (Map.lookup key omap'))
     when vanished finalizer
  where
     unref key (cnt,object) =