1 files changed, 30 insertions, 1 deletions

diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index 275f644e..e05d0782 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -13,9 +13,14 @@ import Network.Socket
     , AddrInfo(..)
     , AddrInfoFlag(..)
     )
-import Network.BSD (getHostName)
+import Network.BSD 
+    ( getHostName
+    , hostName
+    , hostAliases
+    )
 import System.IO (Handle)
 import Control.Concurrent.STM (TChan)
+import qualified Data.ByteString.Char8 as S (ByteString,pack,putStr,putStrLn,append)
 import Data.ByteString.Lazy.Char8 as L  
     ( ByteString
     , unpack
@@ -23,6 +28,7 @@ import Data.ByteString.Lazy.Char8 as L
     , splitWith
     , uncons
     , takeWhile
+    , fromChunks
     )
 import Text.Show.ByteString as L
 import Data.Binary.Builder as B
@@ -30,6 +36,8 @@ import Data.Binary.Put
 import Control.DeepSeq
 import ByteStringOperators
 import SocketLike
+import GetHostByAddr
+import Data.Maybe (listToMaybe,catMaybes)
 
 class JabberClientSession session where
     data XMPPClass session
@@ -46,6 +54,7 @@ class JabberClientSession session where
     getMyPending       :: session -> IO [ByteString]
     getMySolicited     :: session -> IO [ByteString]
     addSolicited :: session -> ByteString -> JID ->  IO ()
+    isSubscribed :: session -> ByteString -> IO Bool
 
 class JabberPeerSession session where
     data XMPPPeerClass session
@@ -58,6 +67,7 @@ class JabberPeerSession session where
     sendPeerMessage  :: session -> OutBoundMessage -> IO ()
     getBuddies       :: XMPPPeerClass session -> ByteString -> IO [ByteString]
     getSubscribers   :: XMPPPeerClass session -> ByteString -> IO [ByteString]
+    processApproval  :: session -> ByteString -> JID -> IO ()
 
 -- | Jabber ID (JID) datatype
 data JID = JID { name :: Maybe ByteString
@@ -77,6 +87,9 @@ data Presence = Presence JID JabberShow
 data RosterEvent = RequestedSubscription 
                     {- user: -} ByteString 
                     {- contact: -} ByteString
+                 | NewBuddy 
+                    {- user: -} ByteString
+                    {- contact: -} ByteString
  deriving Prelude.Show
 
 data Peer = LocalHost | RemotePeer SockAddr
@@ -198,3 +211,19 @@ data OutBoundMessage = OutBoundPresence Presence
                         | Approval JID JID
  deriving Prelude.Show
 
+getNamesForPeer :: Peer -> IO [S.ByteString]
+getNamesForPeer LocalHost = fmap ((:[]) . S.pack) getHostName
+getNamesForPeer peer@(RemotePeer addr) = do
+    ent <- getHostByAddr addr --  AF_UNSPEC addr
+    let names = hostName ent : hostAliases ent
+    return . map S.pack $ names
+
+
+asHostNameJID :: JID -> IO (Maybe ByteString)
+asHostNameJID jid = do
+    let n   = name jid
+        rsc = resource jid
+    names <- getNamesForPeer (peer jid)
+    let tostr p = n <$++> "@" <?++> L.fromChunks [p] <++?>  "/" <++$> rsc
+        jidstrs = fmap tostr names
+    return (listToMaybe jidstrs)