Send subscription requests to client for approval, and then

forward the answer to the remote peer.  Todo: related roster update.

1 files changed, 7 insertions, 0 deletions

diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index e05d0782..6d00d509 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -38,6 +38,7 @@ import ByteStringOperators
 import SocketLike
 import GetHostByAddr
 import Data.Maybe (listToMaybe,catMaybes)
+import Control.Monad.STM
 
 class JabberClientSession session where
     data XMPPClass session
@@ -48,6 +49,7 @@ class JabberClientSession session where
     subscribe :: session -> Maybe JID -> IO (TChan Presence)
     subscribeToRoster :: session -> IO (TChan RosterEvent)
     forCachedPresence :: session -> (Presence -> IO ()) -> IO ()
+    sendPending :: session -> IO ()
     getMyBuddies       :: session -> IO [ByteString]
     getMySubscribers   :: session -> IO [ByteString]
     getMyOthers        :: session -> IO [ByteString]
@@ -55,6 +57,7 @@ class JabberClientSession session where
     getMySolicited     :: session -> IO [ByteString]
     addSolicited :: session -> ByteString -> JID ->  IO ()
     isSubscribed :: session -> ByteString -> IO Bool
+    approveSubscriber :: session -> ByteString -> IO ()
 
 class JabberPeerSession session where
     data XMPPPeerClass session
@@ -68,6 +71,7 @@ class JabberPeerSession session where
     getBuddies       :: XMPPPeerClass session -> ByteString -> IO [ByteString]
     getSubscribers   :: XMPPPeerClass session -> ByteString -> IO [ByteString]
     processApproval  :: session -> ByteString -> JID -> IO ()
+    processRequest   :: session -> ByteString -> JID -> IO ()
 
 -- | Jabber ID (JID) datatype
 data JID = JID { name :: Maybe ByteString
@@ -90,6 +94,9 @@ data RosterEvent = RequestedSubscription
                  | NewBuddy 
                     {- user: -} ByteString
                     {- contact: -} ByteString
+                 | PendingBuddy
+                    {- user: -} ByteString
+                    {- contact: -} ByteString
  deriving Prelude.Show
 
 data Peer = LocalHost | RemotePeer SockAddr