Fix roster bug: allow multiple tox buddies at once.

1 files changed, 4 insertions, 6 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index c2398607..cc3f488b 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -1050,7 +1050,7 @@ modifyRosterFile man doit whose profile to addrs bAdd bWildCard = do
     let (mu,_,_) = splitJID to
         -- For each jid in the file, this function will decide whether to keep
         -- it (possibly modified) which is indicated by Just _ or to remove the
-        -- item from the file which is indicatd by Nothing.
+        -- item from the file which is indicated by Nothing.
         cmp :: L.ByteString -> IO (Maybe L.ByteString)
         cmp jid = do
             let (msu,stored_h,mr) = splitJID (lazyByteStringToText jid)
@@ -1064,11 +1064,9 @@ modifyRosterFile man doit whose profile to addrs bAdd bWildCard = do
                         _                       -> keep
             fmap join $ sequence $ do
                 guard $ isNothing mr -- delete if resource specified in file.
-                stored_u <- msu      -- delete if user not specified in file.
-                case mu of
-                    Nothing | not bWildCard -> Just keep    -- do not delete if /to/ has no user field
-                    Just u | u /= stored_u  -> Just keep    -- do not delete if users don't match
-                    _                       -> Just iocheck -- do not delete unless hostname alias
+                if mu == msu || bWildCard
+                    then Just iocheck -- do not delete unless hostname alias
+                    else Just keep    -- do not delete if user field doesn't match.
     doit (textToLazyByteString whose) (Text.unpack profile)
          cmp
          (guard bAdd >> Just (textToLazyByteString to))