More consistency in name of client JID.

1 files changed, 12 insertions, 9 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index 4765b05a..c614cc4e 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -828,7 +828,6 @@ sendCachedPresence state k = do
     mcon <- atomically $ do ktc <- readTVar (keyToChan state)
                             return $ Map.lookup k ktc
     flip (maybe $ return ()) mcon $ \con -> do
-    -- me <- textHostName
     forM_ (Map.toList onlines) $ \(pk, umap) -> do
         forM_ (Map.toList umap) $ \(user,rp) -> do
         let h = peerKeyToText pk
@@ -842,7 +841,7 @@ sendCachedPresence state k = do
                                    (connChan con)
 
     pending <- configText ConfigFiles.getPending (clientUser client) (clientProfile client)
-    hostname <- textHostName
+    hostname <- nameForClient state k
     forM_ pending $ \pending_jid -> do
         let cjid = unsplitJID ( Just $ clientUser client
                               , hostname
@@ -936,7 +935,7 @@ clientSubscriptionRequest state fail k stanza chan = do
 
         case stanzaType stanza of
          PresenceRequestSubscription True -> do
-            hostname <- textHostName
+            hostname <- nameForClient state k
             let cjid = unsplitJID (Just $ clientUser client, hostname,Nothing)
             chans <- clientCons state ktc (clientUser client)
             forM_ chans $ \( Conn { connChan=chan }, client ) -> do
@@ -986,7 +985,11 @@ resolvedFromRoster doit u profile = do
 
 clientCons :: PresenceState
             -> Map ConnectionKey t -> Text -> IO [(t, ClientState)]
-clientCons state ktc u = do
+clientCons state ktc u = map snd <$> clientCons' state ktc u
+
+clientCons' :: PresenceState
+            -> Map ConnectionKey t -> Text -> IO [(ConnectionKey,(t, ClientState))]
+clientCons' state ktc u = do
     mlp <- atomically $ do
             cmap <- readTVar $ clientsByUser state
             return $ Map.lookup u cmap
@@ -994,7 +997,7 @@ clientCons state ktc u = do
                 Map.toList (networkClients lp)
         doit (k,client) = do
             con <- Map.lookup k ktc
-            return (con,client)
+            return (k,(con,client))
     return $ mapMaybe doit ks
 
 peerSubscriptionRequest :: PresenceState -> IO () -> ConnectionKey -> Stanza -> TChan Stanza -> IO ()
@@ -1121,7 +1124,7 @@ clientInformSubscription state fail k stanza = do
         is_intereseted <- atomically $ clientIsInterested client
         when is_intereseted $ do
         flip (maybe $ return ()) (Map.lookup ck ktc) $ \con -> do
-        hostname <- textHostName
+        hostname <- nameForClient state ck
         -- TODO: Should cjid include the resource?
         let cjid = unsplitJID (mu, hostname, Nothing)
         update <- makeRosterUpdate cjid to [relationship]
@@ -1183,10 +1186,10 @@ peerInformSubscription state fail k stanza = do
     addToRosterFile      addf user profile from'' addrs
     removeFromRosterFile remf user profile from'' addrs
 
-    hostname <- textHostName
+    chans <- clientCons' state ktc user
+    forM_ chans $ \(ckey,(Conn { connChan=chan }, client)) -> do
+    hostname <- nameForClient state ckey
     let to' = unsplitJID (Just user, hostname, Nothing)
-    chans <- clientCons state ktc user
-    forM_ chans $ \(Conn { connChan=chan }, client) -> do
     update <- makeRosterUpdate to' from'' [relationship]
     is_intereseted <- atomically $ clientIsInterested client
     when is_intereseted $ do