Forward instant messages from XMPP clients to Tox peers.

1 files changed, 11 insertions, 3 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index fefec650..e099334e 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1982,14 +1982,22 @@ main = do
                 xmppSink         = newXmmpSink netcrypto
             forM_ msv $ \sv -> do
                 let Tox.HaveDHTKey saddr = Tox.ncSockAddr netcrypto
-                announceToxJabberPeer (Tox.ncMyPublicKey netcrypto) (Tox.ncTheirPublicKey netcrypto) (xmppEventChannel sv) addrTox saddr pingflag xmppSrc xmppSink
+                    Tox.HaveDHTKey dkey  = Tox.ncTheirDHTKey netcrypto
+                    nid                  = Tox.key2id dkey
+                    them                 = Tox.ncTheirPublicKey netcrypto
+                    me                   = Tox.ncMyPublicKey netcrypto
+                announceToxJabberPeer me them (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)
+                mbacc <- HashMap.lookup (Tox.key2id me)
                          <$> atomically (readTVar accounts)
+                -- TODO: Add account if it doesn't exist?
                 forM_ mbacc $ \acnt -> do
                 now <- getPOSIXTime
-                atomically $ setEstablished now (Tox.ncTheirPublicKey netcrypto) acnt
+                forM_ (either (const Nothing) Just $ Tox.nodeInfo nid saddr)
+                    $ \ni -> do
+                atomically $ do setEstablished now them acnt
+                                setContactAddr now them ni acnt
             atomically $ do
                 supply <- readTVar (Tox.listenerIDSupply netCryptoSessionsState)
                 let (listenerId,supply') = freshId supply