3 files changed, 41 insertions, 9 deletions

diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index c4e4d7f6..fb53c2fb 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -331,6 +331,11 @@ iq_service_unavailable host iq_id mjid req =
     , EventEndElement "{jabber:client}iq"
     ]
 
+getRoster session = do
+    budies <- getMyBuddies session
+    subscribers <- getMySubscribers session
+    return ([]::[Event]) -- TODO
+
 handleIQGet session cmdChan tag = do
     withJust (lookupAttrib "id" (tagAttrs tag)) $ \stanza_id -> do
     whenJust nextElement $ \child -> do
@@ -356,6 +361,18 @@ handleIQGet session cmdChan tag = do
                       , EventEndElement "{jabber:client}iq"
                       ]
             atomically . writeTChan cmdChan . Send $ pong
+        "{jabber:iq:roster}query" -> liftIO $ do
+            putStrLn $ "REQUESTED ROSTER " ++ show tag
+            -- REQUESTED ROSTER EventBeginElement 
+            -- (Name {nameLocalName = "iq", nameNamespace = Just "jabber:client", namePrefix = Nothing}) 
+            -- [(Name { nameLocalName = "id"
+            --        , nameNamespace = Nothing
+            --        , namePrefix = Nothing},
+            --  [ContentText "32a337c2-7b22-45b6-9d21-15ded0d079ec"])
+            -- ,(Name {nameLocalName = "type", nameNamespace = Nothing, namePrefix = Nothing},
+            --  [ContentText "get"])]
+            roster <- getRoster session
+            atomically . writeTChan cmdChan . Send $ roster
         req -> unhandledGet req
     
 
diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index c6925aa4..747ceb0e 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -39,6 +39,11 @@ class JabberClientSession session where
     closeSession :: session -> IO ()
     subscribe :: session -> Maybe JID -> IO (TChan Presence)
     forCachedPresence :: session -> (Presence -> IO ()) -> IO ()
+    getMyBuddies       :: session -> IO [ByteString]
+    getMySubscribers   :: session -> IO [ByteString]
+    getMyOthers        :: session -> IO [ByteString]
+    getMyPending       :: session -> IO [ByteString]
+    getMySolicited     :: session -> IO [ByteString]
 
 class JabberPeerSession session where
     data XMPPPeerClass session
@@ -50,9 +55,6 @@ class JabberPeerSession session where
     peerSessionFactory :: session -> XMPPPeerClass session
     getBuddies       :: XMPPPeerClass session -> ByteString -> IO [ByteString]
     getSubscribers   :: XMPPPeerClass session -> ByteString -> IO [ByteString]
-    getOthers        :: XMPPPeerClass session -> ByteString -> IO [ByteString]
-    getPending       :: XMPPPeerClass session -> ByteString -> IO [ByteString]
-    getSolicited     :: XMPPPeerClass session -> ByteString -> IO [ByteString]
 
 -- | Jabber ID (JID) datatype
 data JID = JID { name :: Maybe ByteString
diff --git a/Presence/main.hs b/Presence/main.hs
index 25ac994b..0eae8677 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -86,7 +86,7 @@ data PresenceState = PresenceState
 
 getJabberUserForId muid =
              maybe (return "nobody") 
-                   (\uid -> 
+                   (\(uid,_) -> 
                         handle (\(SomeException _) -> 
                                 return . L.append "uid." . L.pack . show $ uid)
                           $ do
@@ -129,8 +129,7 @@ instance JabberClientSession ClientSession where
 
     getJID       s             = do
         let host = localhost s
-        muid <- fmap (fmap fst) $ readIORef (unix_uid s)
-        user <- getJabberUserForId muid
+        user <- readIORef (unix_uid s) >>= getJabberUserForId
 
         rsc <- readIORef (unix_resource s)
         -- let jid = user <++> "@" <++> host <++?> "/" <++$> rsc
@@ -169,6 +168,23 @@ instance JabberClientSession ClientSession where
             L.putStrLn $ "cached presence: " <++> bshow p
             action p
 
+    getMyBuddies s = do
+        user <- readIORef (unix_uid s) >>= getJabberUserForId
+        ConfigFiles.getBuddies user
+    getMySubscribers s = do
+        user <- readIORef (unix_uid s) >>= getJabberUserForId
+        ConfigFiles.getSubscribers user
+    getMyOthers s = do
+        user <- readIORef (unix_uid s) >>= getJabberUserForId
+        ConfigFiles.getOthers user
+    getMyPending s = do
+        user <- readIORef (unix_uid s) >>= getJabberUserForId
+        ConfigFiles.getPending user
+    getMySolicited s = do
+        user <- readIORef (unix_uid s) >>= getJabberUserForId
+        ConfigFiles.getSolicited user
+
+
 tupleToJID (user,tty,pid) = jid user LocalHost tty
 
 data PeerSession = PeerSession {
@@ -229,9 +245,6 @@ instance JabberPeerSession PeerSession where
 
     getBuddies     _ user = ConfigFiles.getBuddies user
     getSubscribers _ user = ConfigFiles.getSubscribers user
-    getOthers      _ user = ConfigFiles.getOthers user
-    getPending     _ user = ConfigFiles.getPending user
-    getSolicited   _ user = ConfigFiles.getSolicited user
 
 
 subscribeToChan tmvar =