Parameterized Account to hold arbitrary information.

1 files changed, 26 insertions, 26 deletions

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