1 files changed, 2 insertions, 67 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index e8ab5490..813c7c7b 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -6,6 +6,7 @@
 -- {-# LANGUAGE GADTs               #-}
 module XMPPServer 
     ( module XMPPServer
+    , module XMPPTypes
     , quitListening 
     )  where
 
@@ -58,39 +59,13 @@ import Control.Concurrent.STM
 import Control.Concurrent
 import Control.Exception as Exception
 import Text.Show.ByteString as L
-import Data.Binary.Builder as B
-import Data.Binary.Put
 import qualified Data.Map as Map
 import GHC.Conc
 import Network.BSD hiding (getHostByAddr)
 import Control.Concurrent.Async
 import qualified Data.Set as Set
 import GetHostByAddr
-
-data Peer = LocalHost | RemotePeer SockAddr
-  deriving (Eq,Prelude.Show)
-
-instance Ord Peer where
-    LocalHost <= _  
-      = True
-    RemotePeer (SockAddrUnix a) <= RemotePeer (SockAddrUnix b)
-      = a <= b
-    RemotePeer (SockAddrUnix _) <= _
-      = True
-    RemotePeer (SockAddrInet aport a) <= RemotePeer (SockAddrInet bport b)
-      = (a,aport) <= (b,bport)
-    RemotePeer (SockAddrInet aport a) <= _
-      = True
-    RemotePeer (SockAddrInet6 aport aflow a ascope) <= RemotePeer (SockAddrInet6 bport bflow b bscope)
-      = (a,aport,ascope,aflow) <= (b,bport,bscope,bflow)
-    a <= b = False
-
--- | Jabber ID (JID) datatype
-data JID = JID { name :: Maybe ByteString
-               , peer :: Peer
-               , resource :: Maybe ByteString
-               }
- deriving (Eq,Ord)
+import XMPPTypes
 
 is_remote (RemotePeer _) = True
 is_remote _              = False
@@ -110,37 +85,10 @@ getNamesForPeer peer@(RemotePeer addr) = do
     return . map pack $ names
 
 
-showPeer :: Peer -> ByteString
-showPeer LocalHost = "localhost"
-showPeer (RemotePeer addr@(SockAddrInet _ _)) = pack $ stripColon (Prelude.show addr)
- where stripColon s = pre where (pre,port) = break (==':') s
-showPeer (RemotePeer addr@(SockAddrInet6 _ _ _ _)) = pack $ stripColon (Prelude.show addr)
- where stripColon s = if null bracket then pre else pre ++ "]"
-          where
-            (pre,bracket) = break (==']') s
-
 peerAddr :: Peer -> SockAddr
 peerAddr (RemotePeer addr) = addr
 -- peerAddr LocalHost = throw exception
 
-instance L.Show JID where
-    showp (JID n s r ) = putBuilder . B.fromLazyByteString $ n <$++> "@" <?++> showPeer s <++?>  "/" <++$> r
-
-instance Prelude.Show JID where
-    show jid = L.unpack $ L.show jid
-
-instance NFData JID where
-    rnf v@(JID n s r) = n `seq` s `seq` r `seq` ()
-
-jid user host rsrc = JID (Just user) host (Just rsrc)
-
-data JabberShow = Offline
-                | Away
-                | Available
- deriving (Prelude.Show,Enum,Ord,Eq,Read)
-
-data Presence = Presence JID JabberShow
- deriving Prelude.Show
 
 xmlifyPresenceForPeer sock (Presence jid stat) = do
     -- TODO: accept socket argument and determine local ip address
@@ -184,19 +132,6 @@ instance NFData Presence where
     rnf (Presence jid stat) = rnf jid `seq` stat `seq` ()
 
 
-class XMPPSession session where
-    data XMPPClass session
-    newSession   :: XMPPClass session -> Socket -> Handle -> 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]
-
 greet host = L.unlines 
     [ "<?xml version='1.0'?>"
     , "<stream:stream"