Use ordinary (.tox) hostnames in JIDs from Tox peers to clients.

1 files changed, 10 insertions, 6 deletions

diff --git a/ToxToXMPP.hs b/ToxToXMPP.hs
index 9e72da72..8b2544d7 100644
--- a/ToxToXMPP.hs
+++ b/ToxToXMPP.hs
@@ -21,15 +21,19 @@ import Network.Tox.NodeId
 import Util                         (unsplitJID)
 import XMPPServer                   as XMPP
 
+xmppHostname :: PublicKey -> Text
+xmppHostname k = T.pack $ show (key2id k) ++ ".tox"
+
 toxToXmpp :: Monad m => SockAddr -> PublicKey -> Text -> Conduit Tox.CryptoMessage m XML.Event
 toxToXmpp laddr me theirhost = do
     CL.sourceList $ XMPP.greet' "jabber:server" theirhost
-    let me_u    = T.pack $ show (key2id me)
-        im_from = (Just $ "root@" <> theirhost)      -- /from/
+    let me_u    = Nothing
+        me_h    = xmppHostname me
+        im_from = (Just $ unsplitJID (Nothing, theirhost, Nothing)) -- /from/
         im_to   = (Just $ unsplitJID
-                            ( Just me_u
+                            ( me_u
                             -- /to/ should match local address of this node.
-                            , T.pack (show laddr)
+                            , me_h
                             , Nothing))
     awaitForever $ \case
 
@@ -44,8 +48,8 @@ toxToXmpp laddr me theirhost = do
 
         toxmsg -> do
             xmppInstantMessage "jabber:server"
-                (Just theirhost)      -- /from/
-                (Just $ unsplitJID (Just me_u,T.pack (show laddr),Nothing)) -- /to/ should match local address of this node.
+                im_from
+                im_to  -- /to/ should match local address of this node.
                 [ attr "style" "font-weight:bold; color:red" ]
                 (T.pack $ show $ msgID toxmsg)