WIP: Deliver tox generated messages to xmpp clients.

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 2b5974f1..b81e88b5 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1375,7 +1375,8 @@ newXmmpSink session@(Tox.NCrypto { ncOutgoingQueue = outGoingQVar, ncPacketQueue
 
 -- | Called upon a new Tox friend-connection session with a remote peer in
 -- order to set up translating conduits that simulate a remote XMPP server.
-announceToxJabberPeer :: PublicKey -- ^ Remote tox node's long-term user key.
+announceToxJabberPeer :: PublicKey  -- ^ This node's long-term user key.
+                      -> PublicKey -- ^ Remote tox node's long-term user key.
                       -> TChan ((ConnectionKey,SockAddr), Tcp.ConnectionEvent XML.Event)
                       -> SockAddr -- ^ Local bind address for incoming Tox packets.
                       -> SockAddr -- ^ Remote address for this connection.
@@ -1383,14 +1384,14 @@ announceToxJabberPeer :: PublicKey -- ^ Remote tox node's long-term user key.
                       -> C.Source IO Tox.CryptoMessage
                       -> C.Sink (Flush Tox.CryptoMessage) IO ()
                       -> IO (Maybe (Tox.NetCryptoSession -> Tox.NetCryptoSession))
-announceToxJabberPeer them echan laddr saddr pingflag tsrc tsnk
+announceToxJabberPeer me them echan laddr saddr pingflag tsrc tsnk
     = do
      atomically $ writeTChan echan
         ( (PeerKey saddr, laddr )
         , Tcp.Connection pingflag xsrc xsnk )
      return Nothing
  where
-    xsrc = tsrc =$= toxToXmpp (T.pack $ show (Tox.key2id them) ++ ".tox")
+    xsrc = tsrc =$= toxToXmpp laddr me (T.pack $ show (Tox.key2id them) ++ ".tox")
     xsnk = flushPassThrough xmppToTox =$= tsnk
 
 vShowMe :: Tox.ViewSnapshot -> Int -> B.ByteString
@@ -1783,7 +1784,7 @@ main = do
                 xmppSink         = newXmmpSink netcrypto
             forM_ msv $ \sv -> do
                 let Tox.HaveDHTKey saddr = Tox.ncSockAddr netcrypto
-                announceToxJabberPeer (Tox.ncTheirPublicKey netcrypto) (xmppEventChannel sv) addrTox saddr pingflag xmppSrc xmppSink
+                announceToxJabberPeer (Tox.ncMyPublicKey netcrypto) (Tox.ncTheirPublicKey netcrypto) (xmppEventChannel sv) addrTox saddr pingflag xmppSrc xmppSink
                 forM_ mbtox $ \tox -> do
                 let ContactInfo{accounts} = Tox.toxContactInfo tox
                 mbacc <- HashMap.lookup (Tox.key2id $ Tox.ncMyPublicKey netcrypto)