Forward instant messages from XMPP clients to Tox peers.

1 files changed, 13 insertions, 1 deletions

diff --git a/ToxManager.hs b/ToxManager.hs
index d16a5d2e..6d0149cf 100644
--- a/ToxManager.hs
+++ b/ToxManager.hs
@@ -26,7 +26,7 @@ import qualified Network.Tox.Onion.Transport as Tox
 import Presence
 import Text.Read
 import ToxToXMPP
-import XMPPServer                            (ClientAddress)
+import XMPPServer
 import DPut
 
 
@@ -140,5 +140,17 @@ toxman announcer toxbkts tox presence = ToxManager
                 Just acc -> setContactPolicy (Tox.id2key themid) TryingToConnect acc
             -- If unscheduled and unconnected, schedule recurring search for this contact.
         _ -> return () -- Remove contact.
+    , resolveToxPeer = \me them -> do
+        let lookupContact accs
+                = do meid <- readMaybe $ T.unpack me
+                     themid <- readMaybe $ T.unpack them
+                     acc <- HashMap.lookup meid accs
+                     return $ HashMap.lookup themid <$> readTVar (contacts acc)
+        atomically $ do
+            accs <- let ContactInfo{ accounts } = Tox.toxContactInfo tox
+                    in readTVar accounts
+            mc <- join <$> sequence (lookupContact accs)
+            maddr <- join <$> mapM (readTVar . contactLastSeenAddr) mc
+            return $ addrToPeerKey . Remote . Tox.nodeAddr . snd <$> maddr
     }