1 files changed, 11 insertions, 3 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 912bbf0b..e44ae37b 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -1358,6 +1358,12 @@ monitor sv params xmpp = do
                         dput XJabber $ "CHAT " ++ Text.unpack rkey ++ ": <" ++ Text.unpack cnick ++ "> " ++ show es
                         forM_ es $ \case
                             Join | mine -> sendRoomOccupants muckey me cnick rkey r replyto
+                            Join        -> do
+                                stanza <- makePresenceStanzaEx "jabber:client" (Just $ roomjid muckey me rkey cnick) Available
+                                            [ EventBeginElement "{http://jabber.org/protocol/muc#user}x" []
+                                            , EventEndElement "{http://jabber.org/protocol/muc#user}x"
+                                            ]
+                                ioWriteChan replyto stanza
                             _           -> return ()
       ]
     action
@@ -1367,12 +1373,14 @@ monitor sv params xmpp = do
         where
             _ = str :: String
 
+roomjid :: Text {- ^ service -} -> Text {- ^ hostname -} -> Text {- ^ room -} -> Text {- ^ nick -} -> Text
+roomjid a me room n = room <> "@" <> a <> "." <> me <> "/" <> n
+
 sendRoomOccupants :: Text -> Text -> Text -> Text -> JoinedRoom k -> TChan Stanza -> IO ()
 sendRoomOccupants a me them room r replyto = do
-    let roomjid n = room <> "@" <> a <> "." <> me <> "/" <> n
-    xs <- map (\(n,m) -> (roomjid n, m))
+    xs <- map (\(n,m) -> (roomjid a me room n, m))
              <$> atomically (roomOccupants $ joinedRoom r)
-    let (ys,xs') = partition (\(jid,_) -> jid == roomjid them) xs
+    let (ys,xs') = partition (\(jid,_) -> jid == roomjid a me room them) xs
     forM_ xs $ \(jid,_) -> do
         stanza <- makePresenceStanzaEx "jabber:client" (Just jid) Available
             [ EventBeginElement "{http://jabber.org/protocol/muc#user}x" []