1 files changed, 19 insertions, 6 deletions

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 =