2 files changed, 45 insertions, 1 deletions

diff --git a/Presence/ConfigFiles.hs b/Presence/ConfigFiles.hs
index ad0f4c29..32ed8b86 100644
--- a/Presence/ConfigFiles.hs
+++ b/Presence/ConfigFiles.hs
@@ -13,6 +13,9 @@ import Control.Exception
 import Control.Monad
 import Control.DeepSeq
 import ByteStringOperators () -- For NFData instance
+import ControlMaybe
+import Data.List (partition)
+import Data.Maybe (catMaybes,isJust)
 
 type User = ByteString
 
@@ -51,6 +54,38 @@ addItem item tag path =
                          L.hPutStrLn h item
     in doit
 
+
+modifyFile ::
+  (ByteString,FilePath)
+  -> ByteString
+  -> (ByteString -> IO (Maybe ByteString))
+  -> Maybe ByteString
+  -> IO ()
+modifyFile (tag,file) user test appending = configPath user file >>= doit
+    where
+        doit path = do
+         handle (\e -> when (isDoesNotExistError e) 
+                       (createConfigFile tag path >> doit path))
+           $ do exists <- fileExist path
+                if exists
+                  then do
+                    xs <- withFile path ReadMode $ \h -> do
+                             contents <- L.hGetContents h
+                             case L.lines contents of
+                              x:xs -> mapM test xs
+                              _    -> return []
+                    let (keepers,deleted) = partition isJust xs
+                    withFile path WriteMode $ \h -> do
+                        L.hPutStrLn h tag
+                        forM_ (catMaybes keepers) (L.hPutStrLn h)
+                        withJust appending (L.hPutStrLn h)
+                  else withFile path WriteMode $ \h -> do
+                         L.hPutStrLn h tag
+                         withJust appending (L.hPutStrLn h)
+
+
+modifySolicited = modifyFile ("<? solicited ?>",solicitedFile)
+
 addBuddy :: User -> ByteString -> IO ()
 addBuddy user buddy =
     configPath user buddyFile >>= addItem buddy "<? buddies ?>"
diff --git a/Presence/main.hs b/Presence/main.hs
index a7ff5e5a..bbaac97a 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -105,6 +105,15 @@ data ClientSession = ClientSession {
     presence_state :: PresenceState
 }
 
+addJid modify user jid = do
+    newitem <- parseHostNameJID jid
+    let cmp jid = do
+            -- putStrLn $ "Comparing "<++>bshow jid
+            olditem <- parseHostNameJID jid
+            if olditem==newitem then return Nothing
+                                else return $ Just jid
+    modify user cmp (Just jid)
+
 instance JabberClientSession ClientSession where
     data XMPPClass ClientSession = ClientSessions PresenceState
 
@@ -189,7 +198,7 @@ instance JabberClientSession ClientSession where
 
     addSolicited s jid = do
         user <- readIORef (unix_uid s) >>= getJabberUserForId
-        ConfigFiles.addSolicited user jid -- (L.show jid)
+        addJid ConfigFiles.modifySolicited user jid
         let rchan = rosterChannel . presence_state $ s
         atomically $ do
             isempty <- isEmptyTMVar rchan