2 files changed, 16 insertions, 1 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 3d4120fa..a118ce88 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -190,6 +190,7 @@ data XMPPServerParameters =
     , xmppInformClientPresence :: ConnectionKey -> Stanza -> IO ()
     , xmppInformPeerPresence :: ConnectionKey -> Stanza -> IO ()
     , xmppAnswerProbe :: ConnectionKey -> Stanza -> TChan Stanza -> IO ()
+    , xmppClientSubscriptionRequest :: IO () -> ConnectionKey -> Stanza -> IO () 
     }
 
 
@@ -1607,6 +1608,9 @@ monitor sv params xmpp = do
                             xmppSubscribeToRoster xmpp k
                         PresenceStatus {} -> do
                             xmppInformClientPresence xmpp k stanza
+                        PresenceRequestSubscription {} -> do
+                            let fail = return () -- todo
+                            xmppClientSubscriptionRequest xmpp fail k stanza
                         NotifyClientVersion name version -> do
                             enableClientHacks name version replyto
                         UnrecognizedQuery query -> do
diff --git a/xmppServer.hs b/xmppServer.hs
index 823e1aba..41f0012e 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -609,7 +609,17 @@ sendCachedPresence state k = do
         sendModifiedStanzaToClient (dup { stanzaFrom=Just from' })
                                    (connChan con)
 
-    -- TODO: send local buddies in clientsByUser
+    -- Note: relying on self peer connection to send
+    -- send local buddies.
+    return ()
+
+clientSubscriptionRequest :: PresenceState -> IO () -> ConnectionKey -> Stanza -> IO ()
+clientSubscriptionRequest state fail k stanza = do
+    flip (maybe fail) (stanzaTo stanza) $ \to -> do
+    -- TODO: resolve hostname
+    -- TODO: add to solicitors
+    -- TODO; if already connected, send solicitation
+    -- TODO: addPeer
     return ()
 
 main = runResourceT $ do
@@ -647,6 +657,7 @@ main = runResourceT $ do
         , xmppInformClientPresence = informClientPresence state
         , xmppInformPeerPresence = informPeerPresence state
         , xmppAnswerProbe = answerProbe state
+        , xmppClientSubscriptionRequest = clientSubscriptionRequest state
         }
     liftIO $ do
     atomically $ putTMVar (server state) sv