3 files changed, 38 insertions, 38 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 20302343..a13a4f10 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -248,7 +248,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             in client
     return $ either mkclient mkclient tblvar handlers
 
-data Tox = Tox
+data Tox extra  = Tox
     { toxDHT            :: DHT.Client
     , toxOnion          :: Onion.Client RouteId
     , toxToRoute        :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
@@ -260,17 +260,17 @@ data Tox = Tox
     , toxTokens         :: TVar SessionTokens
     , toxAnnouncedKeys  :: TVar Onion.AnnouncedKeys
     , toxOnionRoutes    :: OnionRouter
-    , toxContactInfo    :: ContactInfo
+    , toxContactInfo    :: ContactInfo extra
     , toxAnnounceToLan  :: IO ()
-    , toxMgr :: Manager ToxProgress Key
+    , toxMgr            :: Manager ToxProgress Key
     }
 
 -- | initiate a netcrypto session, blocking
-netCrypto :: Tox -> SecretKey -> PublicKey{-UserKey -} -> IO [NetCryptoSession]
+netCrypto :: Tox extra -> SecretKey -> PublicKey{-UserKey -} -> IO [NetCryptoSession]
 netCrypto tox myseckey theirpubkey = netCryptoWithBackoff 1000000 tox myseckey theirpubkey
 
 -- | helper for 'netCrypto', initiate a netcrypto session, retry after specified millisecs
-netCryptoWithBackoff :: Int -> Tox -> SecretKey -> PublicKey -> IO [NetCryptoSession]
+netCryptoWithBackoff :: Int -> Tox extra -> SecretKey -> PublicKey -> IO [NetCryptoSession]
 netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
     let mykeyAsId = key2id (toPublic myseckey)
     -- TODO: check status of connection here:
@@ -358,7 +358,7 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                             return []
 
 -- | Create a DHTPublicKey packet to send to a remote contact.
-getContactInfo :: Tox -> IO DHT.DHTPublicKey
+getContactInfo :: Tox extra -> IO DHT.DHTPublicKey
 getContactInfo Tox{toxCryptoKeys,toxRouting} = join $ atomically $ do
     r4 <- readTVar $ DHT.routing4 toxRouting
     r6 <- readTVar $ DHT.routing6 toxRouting
@@ -416,7 +416,7 @@ newTox :: TVar Onion.AnnouncedKeys   -- ^ Store of announced keys we are a rende
        -> SockAddr                   -- ^ Bind-address to listen on.
        -> Maybe NetCryptoSessions    -- ^ State of all one-on-one Tox links.
        -> Maybe SecretKey            -- ^ Optional DHT secret key to use.
-       -> IO Tox
+       -> IO (Tox extra)
 newTox keydb addr mbSessionsState suppliedDHTKey = do
     (udp,sock) <- {- addVerbosity <$> -} udpTransport' addr
     (crypto0,sessionsState0) <- case mbSessionsState of
@@ -506,21 +506,21 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
         , toxMgr            = mgr
         }
 
-onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
+onionTimeout :: Tox extra -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
 onionTimeout Tox { toxOnionRoutes = or } (DHT.TransactionId n8 _) od = lookupTimeout or n8 od
 
 routing4nodeInfo :: DHT.Routing -> IO NodeInfo
 routing4nodeInfo (DHT.routing4 -> tv) = R.thisNode <$> readTVarIO tv
 
-dnssdAnnounce :: Tox -> IO ()
+dnssdAnnounce :: Tox extra -> IO ()
 dnssdAnnounce (toxRouting -> r) = do
     ni <- routing4nodeInfo r
     announceToxService (nodePort ni) (nodeId ni)
 
-dnssdDiscover :: Tox -> NodeInfo -> IO ()
+dnssdDiscover :: Tox extra -> NodeInfo -> IO ()
 dnssdDiscover (toxDHT -> client) ni = void $ DHT.ping client ni
 
-forkTox :: Tox -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
+forkTox :: Tox extra -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
 forkTox tox = do
     _ <- forkListener "toxHandshakes" (toxHandshakes tox)
     _ <- forkListener "toxToRoute" (toxToRoute tox)
diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index 9f29d587..64ea861b 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -19,16 +19,16 @@ import Network.Tox.NodeId            (id2key)
 import Network.Tox.Onion.Transport   as Onion
 import System.IO
 
-newtype ContactInfo = ContactInfo
+newtype ContactInfo extra = ContactInfo
       -- | Map our toxid public key to an Account record.
-    { accounts :: TVar (HashMap NodeId{-my userkey-} Account)
+    { accounts :: TVar (HashMap NodeId{-my userkey-} (Account extra))
     }
 
-data Account = Account
-    { userSecret :: SecretKey                     -- local secret key
-    , contacts   :: TVar (HashMap NodeId{-friend's userkey-} Contact) -- received contact info
-    , clientRefs :: TVar (Set ConnectionKey) -- reference count so we know when to send offline etc
-    , eventChan  :: TChan ContactEvent
+data Account extra = Account
+    { userSecret   :: SecretKey                     -- local secret key
+    , contacts     :: TVar (HashMap NodeId{-friend's userkey-} Contact) -- received contact info
+    , accountExtra :: TVar extra
+    , eventChan    :: TChan ContactEvent
     }
 
 data ContactEvent = OnionRouted  { contact :: PublicKey, onionRouted :: OnionData }
@@ -44,16 +44,16 @@ data Contact = Contact
     , contactPolicy        :: TVar (Maybe Connection.Policy)
     }
 
-newContactInfo :: IO ContactInfo
+newContactInfo :: IO (ContactInfo extra)
 newContactInfo = atomically $ ContactInfo <$> newTVar HashMap.empty
 
-myKeyPairs :: ContactInfo -> STM [(SecretKey,PublicKey)]
+myKeyPairs :: ContactInfo extra -> STM [(SecretKey,PublicKey)]
 myKeyPairs (ContactInfo accounts) = do
     acnts <- readTVar accounts
     forM (HashMap.toList acnts) $ \(nid, Account{userSecret}) -> do
         return (userSecret,id2key nid)
 
-updateContactInfo :: ContactInfo -> Onion.AnnouncedRendezvous -> (PublicKey,Onion.OnionData) -> IO ()
+updateContactInfo :: ContactInfo extra -> Onion.AnnouncedRendezvous -> (PublicKey,Onion.OnionData) -> IO ()
 updateContactInfo roster Onion.AnnouncedRendezvous{remoteUserKey} (localUserKey,omsg) = do
     hPutStrLn stderr "updateContactInfo!!!"
     now <- getPOSIXTime
@@ -69,7 +69,7 @@ initContact = Contact <$> newTVar Nothing
                       <*> newTVar Nothing
                       <*> newTVar Nothing
 
-updateAccount' :: PublicKey -> Account -> (Contact -> STM ()) -> STM ()
+updateAccount' :: PublicKey -> Account extra -> (Contact -> STM ()) -> STM ()
 updateAccount' remoteUserKey acc updater = do
     let rkey = key2id remoteUserKey
     cmap <- readTVar (contacts acc)
@@ -80,7 +80,7 @@ updateAccount' remoteUserKey acc updater = do
                            return contact
     updater contact
 
-updateAccount :: POSIXTime -> PublicKey -> Onion.OnionData -> Account -> STM ()
+updateAccount :: POSIXTime -> PublicKey -> Onion.OnionData -> Account extra -> STM ()
 updateAccount now remoteUserKey omsg acc = do
     updateAccount' remoteUserKey acc $ onionUpdate now omsg
     writeTChan (eventChan acc) $ OnionRouted remoteUserKey omsg
@@ -97,39 +97,39 @@ policyUpdate policy contact = writeTVar (contactPolicy contact) $ Just policy
 addrUpdate :: POSIXTime -> SockAddr -> Contact -> STM ()
 addrUpdate now addr contact = writeTVar (contactLastSeenAddr contact) $ Just (now,addr)
 
-setContactPolicy :: PublicKey -> Policy -> Account -> STM ()
+setContactPolicy :: PublicKey -> Policy -> Account extra -> STM ()
 setContactPolicy remoteUserKey policy acc = do
     updateAccount' remoteUserKey acc $ policyUpdate policy
     writeTChan (eventChan acc) $ PolicyChange remoteUserKey policy
 
-setContactAddr :: POSIXTime -> PublicKey -> SockAddr -> Account -> STM ()
+setContactAddr :: POSIXTime -> PublicKey -> SockAddr -> Account extra -> STM ()
 setContactAddr now remoteUserKey addr acc = do
     updateAccount' remoteUserKey acc $ addrUpdate now addr
     writeTChan (eventChan acc) $ AddrChange remoteUserKey addr
 
-setEstablished :: POSIXTime -> PublicKey -> Account -> STM ()
+setEstablished :: POSIXTime -> PublicKey -> Account extra -> STM ()
 setEstablished now remoteUserKey acc =
     writeTChan (eventChan acc) $ SessionEstablished remoteUserKey
 
-setTerminated :: POSIXTime -> PublicKey -> Account -> STM ()
+setTerminated :: POSIXTime -> PublicKey -> Account extra -> STM ()
 setTerminated now remoteUserKey acc =
     writeTChan (eventChan acc) $ SessionTerminated remoteUserKey
 
 
-addContactInfo :: ContactInfo -> SecretKey -> STM ()
-addContactInfo (ContactInfo as) sk = do
-    a <- newAccount sk
+addContactInfo :: ContactInfo extra -> SecretKey -> extra -> STM ()
+addContactInfo (ContactInfo as) sk extra = do
+    a <- newAccount sk extra
     modifyTVar' as $ HashMap.insert (key2id $ toPublic sk) a
 
-delContactInfo :: ContactInfo -> PublicKey -> STM ()
+delContactInfo :: ContactInfo extra -> PublicKey -> STM ()
 delContactInfo (ContactInfo as) pk = modifyTVar' as $ HashMap.delete (key2id pk)
 
-newAccount :: SecretKey -> STM Account
-newAccount sk = Account sk <$> newTVar HashMap.empty
-                           <*> newTVar Set.empty
-                           <*> newBroadcastTChan
+newAccount :: SecretKey -> extra -> STM (Account extra)
+newAccount sk extra = Account sk <$> newTVar HashMap.empty
+                                 <*> newTVar extra
+                                 <*> newBroadcastTChan
 
-dnsPresentation :: ContactInfo -> STM String
+dnsPresentation :: ContactInfo extra -> STM String
 dnsPresentation (ContactInfo accsvar) = do
     accs <- readTVar accsvar
     ms <- forM accs $ \Account { userSecret = sec, contacts = cvar } -> do
@@ -150,7 +150,7 @@ dnsPresentation1 (nid,dk) = unlines
 type LocalKey = NodeId
 type RemoteKey = NodeId
 
-friendRequests :: ContactInfo -> STM (HashMap LocalKey [(RemoteKey,DHT.FriendRequest)])
+friendRequests :: ContactInfo extra -> STM (HashMap LocalKey [(RemoteKey,DHT.FriendRequest)])
 friendRequests (ContactInfo roster) = do
     accs <- readTVar roster
     forM accs $ \Account { userSecret = sec, contacts = cvar } -> do
diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index 5fdcd252..9ff1839c 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -262,7 +262,7 @@ data FriendRequest = FriendRequest
     { friendNoSpam      :: Word32
     , friendRequestText :: ByteString -- UTF8
     }
- deriving (Eq, Show)
+ deriving (Eq, Ord, Show)
 
 
 -- When sent as a DHT request packet (this is the data sent in the DHT request