Untested tox: Update buddies/subscribers on established connection.

1 files changed, 7 insertions, 6 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index c3e60239..2086133d 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -1006,7 +1006,7 @@ addToRosterFile ::
                  -> Text -- profile
                  -> Text -> [PeerAddress] -> t1
 addToRosterFile man doit whose profile to addrs =
-    modifyRosterFile man doit whose profile to addrs True
+    modifyRosterFile man doit whose profile to addrs True False
 
 removeFromRosterFile ::
                       Connection.Manager s Text
@@ -1019,7 +1019,7 @@ removeFromRosterFile ::
                       -> Text -- profile
                       -> Text -> [PeerAddress] -> t1
 removeFromRosterFile man doit whose profile to addrs =
-    modifyRosterFile man doit whose profile to addrs False
+    modifyRosterFile man doit whose profile to addrs False False
 
 -- | Sanity-checked roster file manipulation.  Primarily, this function handles
 -- hostname aliases.
@@ -1045,8 +1045,9 @@ modifyRosterFile ::
                   -> Text       -- ^ JID that will be added or removed a hostname
                   -> [PeerAddress] -- ^ Alias addresses for hostname in the JID.
                   -> Bool       -- ^ True if adding, otherwise False
+                  -> Bool       -- ^ True to allow deleting all users at a host.
                   -> t1
-modifyRosterFile man doit whose profile to addrs bAdd = do
+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
@@ -1066,9 +1067,9 @@ modifyRosterFile man doit whose profile to addrs bAdd = do
                 guard $ isNothing mr -- delete if resource specified in file.
                 stored_u <- msu      -- delete if user not specified in file.
                 case mu of
-                    Nothing                -> 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 _                 -> Just iocheck -- do not delete unless hostname alias
+                    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
     doit (textToLazyByteString whose) (Text.unpack profile)
          cmp
          (guard bAdd >> Just (textToLazyByteString to))