Start watching chatrooms on startup if there are any subscriptions

1 files changed, 5 insertions, 3 deletions

diff --git a/main/Main.hs b/main/Main.hs
index dfa3e1b..d5b06ea 100644
--- a/main/Main.hs
+++ b/main/Main.hs
@@ -295,9 +295,11 @@ interactiveLoop st opts = runInputT inputSettings $ do
     contextOptions <- liftIO $ newMVar []
     chatroomSetVar <- liftIO $ newEmptyMVar
 
-    watched <- case optChatroomAutoSubscribe opts of
-        auto@(Just _) -> fmap Just $ liftIO $ watchChatroomsForCli extPrintLn erebosHead chatroomSetVar contextOptions auto
-        Nothing       -> return Nothing
+    let autoSubscribe = optChatroomAutoSubscribe opts
+        chatroomList = fromSetBy (comparing roomStateData) . lookupSharedValue . lsShared . headObject $ erebosHead
+    watched <- if isJust autoSubscribe || any roomStateSubscribe chatroomList
+        then fmap Just $ liftIO $ watchChatroomsForCli extPrintLn erebosHead chatroomSetVar contextOptions autoSubscribe
+        else return Nothing
 
     server <- liftIO $ do
         startServer (optServer opts) erebosHead extPrintLn $