prefer roster-name to canonical name if possible.

1 files changed, 4 insertions, 12 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 9059a4c0..efd865d8 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -16,8 +16,6 @@ module XMPPServer
     , cloneStanza
     , LangSpecificMessage(..)
     , peerKeyToText
-    , peerKeyToResolvedName
-    , peerKeyToResolvedNames
     , addrToText
     , sendModifiedStanzaToPeer
     , sendModifiedStanzaToClient
@@ -185,7 +183,7 @@ data XMPPServerParameters =
     , xmppRosterOthers       :: ConnectionKey -> IO [Text]
     , xmppSubscribeToRoster :: ConnectionKey -> IO ()
     -- , xmppLookupClientJID :: ConnectionKey -> IO Text
-    , xmppTellClientNameOfPeer :: ConnectionKey -> IO Text
+    , xmppTellClientNameOfPeer :: ConnectionKey -> [Text] -> IO Text
     , xmppDeliverMessage :: (IO ()) -> Stanza -> IO ()
     , xmppInformClientPresence :: ConnectionKey -> Stanza -> IO ()
     , xmppInformPeerPresence :: ConnectionKey -> Stanza -> IO ()
@@ -240,12 +238,6 @@ peerKeyToText :: ConnectionKey -> Text
 peerKeyToText (PeerKey { callBackAddress=addr }) = addrToText addr
 peerKeyToText (ClientKey { localAddress=addr }) = "ErrorClIeNt0"
 
-peerKeyToResolvedName :: ConnectionKey -> IO Text
-peerKeyToResolvedName k@(ClientKey { localAddress=addr }) = return "ErrorClIeNt1"
-peerKeyToResolvedName pk = do
-    ns <- peerKeyToResolvedNames pk
-    return $ maybe (peerKeyToText pk) id (listToMaybe ns)
-
 
 wlog :: String -> IO ()
 wlog s = putStrLn s >> hFlush stdout
@@ -1343,9 +1335,6 @@ sendRoster query xmpp replyto = do
              NetworkOrigin k _ -> Just k
              LocalPeer -> Nothing -- local peer requested roster?
     flip (maybe $ return ()) k $ \k -> do
-    jid <- case k of
-                ClientKey {} -> xmppTellClientHisName xmpp k -- LookupClientJID xmpp k
-                PeerKey {}   -> xmppTellClientNameOfPeer xmpp k
     hostname <- xmppTellMyNameToClient xmpp
     let getlist f = do
             bs <- f xmpp k
@@ -1354,6 +1343,9 @@ sendRoster query xmpp replyto = do
     subscribers <- getlist xmppRosterSubscribers
     solicited   <- getlist xmppRosterSolicited
     subnone0    <- getlist xmppRosterOthers
+    jid <- case k of
+                ClientKey {} -> xmppTellClientHisName xmpp k -- LookupClientJID xmpp k
+                PeerKey {}   -> xmppTellClientNameOfPeer xmpp k (Set.toList buddies)
     let subnone = Set.union solicited subnone0 \\ Set.union buddies subscribers
     let subto = buddies \\ subscribers
     let subfrom = subscribers \\ buddies