1 files changed, 16 insertions, 7 deletions

diff --git a/dht/src/Network/Tox/ContactInfo.hs b/dht/src/Network/Tox/ContactInfo.hs
index d5640ce8..3cf5bb2b 100644
--- a/dht/src/Network/Tox/ContactInfo.hs
+++ b/dht/src/Network/Tox/ContactInfo.hs
@@ -2,20 +2,23 @@
 {-# LANGUAGE LambdaCase #-}
 module Network.Tox.ContactInfo where
 
-import Connection
-
-import Data.Time.Clock.POSIX
+import Control.Arrow
 import Control.Concurrent.STM
 import Control.Monad
 import Crypto.PubKey.Curve25519
 import qualified Data.HashMap.Strict as HashMap
          ;import Data.HashMap.Strict (HashMap)
+import Data.List
 import Data.Maybe
-import Network.Tox.DHT.Transport     as DHT
-import Network.Tox.NodeId            (id2key)
-import Network.Tox.Onion.Transport   as Onion
-import DPut
+import Data.Ord
+import Data.Time.Clock.POSIX
+
+import Connection
 import DebugTag
+import DPut
+import Network.Tox.DHT.Transport   as DHT
+import Network.Tox.NodeId          (id2key)
+import Network.Tox.Onion.Transport as Onion
 
 newtype ContactInfo extra = ContactInfo
     {
@@ -43,6 +46,12 @@ data Contact = Contact
     , contactPolicy        :: TVar (Maybe Connection.Policy)
     }
 
+contactDHTKey :: Contact -> STM (Maybe PublicKey)
+contactDHTKey c = do
+    mkeypkt <- fmap (second dhtpk) <$> readTVar (contactKeyPacket c)
+    mseen <- fmap (second $ id2key . nodeId) <$> readTVar (contactLastSeenAddr c)
+    return $ fmap snd $ listToMaybe $ sortOn (Down . fst) $ catMaybes [mkeypkt,mseen]
+
 newContactInfo :: IO (ContactInfo extra)
 newContactInfo = atomically $ ContactInfo <$> newTVar HashMap.empty