1 files changed, 11 insertions, 5 deletions

diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index b46b4294..6e054708 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -31,18 +31,24 @@ import Control.DeepSeq
 import ByteStringOperators
 import SocketLike
 
-class XMPPSession session where
+class JabberClientSession session where
     data XMPPClass session
     newSession   :: SocketLike sock => XMPPClass session -> sock -> IO session
     setResource  :: session -> ByteString -> IO ()
     getJID       :: session -> IO JID
     closeSession :: session -> IO ()
     subscribe :: session -> Maybe JID -> IO (TChan Presence)
-    announcePresence :: session -> Presence -> IO ()
 
-class XMPPConfig config where
-    getBuddies :: config -> ByteString -> IO [ByteString]
-    getSubscribers :: config -> ByteString -> IO [ByteString]
+class JabberPeerSession session where
+    data XMPPPeerClass session
+    newPeerSession   :: SocketLike sock => XMPPPeerClass session -> sock -> IO session
+    closePeerSession :: session -> IO ()
+    peerAddress      :: session -> Peer
+    userStatus       :: session -> ByteString -> IO [Presence]
+    announcePresence :: session -> Presence -> IO ()
+    peerSessionFactory :: session -> XMPPPeerClass session
+    getBuddies       :: XMPPPeerClass session -> ByteString -> IO [ByteString]
+    getSubscribers   :: XMPPPeerClass session -> ByteString -> IO [ByteString]
 
 -- | Jabber ID (JID) datatype
 data JID = JID { name :: Maybe ByteString