more roster stubs

2 files changed, 14 insertions, 1 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 4eb89f7f..08871cfe 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -192,6 +192,8 @@ data XMPPServerParameters =
     , xmppAnswerProbe :: ConnectionKey -> Stanza -> TChan Stanza -> IO ()
     , xmppClientSubscriptionRequest :: IO () -> ConnectionKey -> Stanza -> TChan Stanza -> IO () 
     , xmppPeerSubscriptionRequest :: IO () -> ConnectionKey -> Stanza -> TChan Stanza -> IO () 
+    , xmppClientInformSubscription :: IO () -> ConnectionKey -> Stanza -> IO ()
+    , xmppPeerInformSubscription :: IO () -> ConnectionKey -> Stanza -> IO ()
     }
 
 
diff --git a/xmppServer.hs b/xmppServer.hs
index 7f610587..d553d1e7 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -586,7 +586,6 @@ answerProbe state k stanza chan = do
         atomically $ writeTChan (connChan conn) pstanza
 
 sendCachedPresence state k = do
-    -- TODO: send buddies in remotesByPeer
     forClient state k (return ()) $ \client -> do
     rbp <- atomically $ readTVar (remotesByPeer state)
     jids <- configText ConfigFiles.getBuddies (clientUser client)
@@ -616,6 +615,7 @@ sendCachedPresence state k = do
 clientSubscriptionRequest :: PresenceState -> IO () -> ConnectionKey -> Stanza -> TChan Stanza -> IO ()
 clientSubscriptionRequest state fail k stanza chan = do
     flip (maybe fail) (stanzaTo stanza) $ \to -> do
+    putStrLn $ "TODO: clientSubscriptionRequest"
     -- TODO: resolve hostname
     -- TODO: add to solicited
     -- TODO; if already connected, send solicitation 
@@ -624,6 +624,7 @@ clientSubscriptionRequest state fail k stanza chan = do
 
 peerSubscriptionRequest :: PresenceState -> IO () -> ConnectionKey -> Stanza -> TChan Stanza -> IO ()
 peerSubscriptionRequest state fail k stanza chan = do
+    putStrLn $ "TODO: peerSubscriptionRequest"
     -- TODO: if already subscribed, reply and quit
 
     -- TODO: add to pending
@@ -640,6 +641,14 @@ peerSubscriptionRequest state fail k stanza chan = do
 
     return ()
 
+clientInformSubscription state fail k stanza = do
+    putStrLn $ "TODO: clientInformSubscription"
+    return ()
+
+peerInformSubscription state fail k stanza = do
+    putStrLn $ "TODO: peerInformSubscription"
+    return ()
+
 main = runResourceT $ do
     state <- liftIO . atomically $ do
         clients <- newTVar Map.empty
@@ -677,6 +686,8 @@ main = runResourceT $ do
         , xmppAnswerProbe = answerProbe state
         , xmppClientSubscriptionRequest = clientSubscriptionRequest state
         , xmppPeerSubscriptionRequest = peerSubscriptionRequest state
+        , xmppClientInformSubscription = clientInformSubscription state
+        , xmppPeerInformSubscription = peerInformSubscription state
         }
     liftIO $ do
     atomically $ putTMVar (server state) sv