directory service: additional commands (#5159)

* directory service: additional commands

* notify superusers

* 48 hours

* replace T.elem

apps/simplex-broadcast-bot/src/Broadcast/Bot.hs

@@ -21,6 +21,7 @@ import Simplex.Chat.Messages.CIContent
 import Simplex.Chat.Options
 import Simplex.Chat.Protocol (MsgContent (..))
 import Simplex.Chat.Types
+import Simplex.Messaging.Util (tshow)
 import System.Directory (getAppUserDataDirectory)
 
 welcomeGetOpts :: IO BroadcastBotOpts
@@ -48,14 +49,14 @@ broadcastBot BroadcastBotOpts {publishers, welcomeMessage, prohibitedMessage} _u
                 CRContactsList _ cts -> void . forkIO $ do
                   let cts' = filter broadcastTo cts
                   forM_ cts' $ \ct' -> sendComposedMessage cc ct' Nothing mc
-                  sendReply $ "Forwarded to " <> show (length cts') <> " contact(s)"
+                  sendReply $ "Forwarded to " <> tshow (length cts') <> " contact(s)"
                 r -> putStrLn $ "Error getting contacts list: " <> show r
             else sendReply "!1 Message is not supported!"
         | otherwise -> do
           sendReply prohibitedMessage
           deleteMessage cc ct $ chatItemId' ci
         where
-          sendReply = sendComposedMessage cc ct (Just $ chatItemId' ci) . textMsgContent
+          sendReply = sendComposedMessage cc ct (Just $ chatItemId' ci) . MCText
           publisher = KnownContact {contactId = contactId' ct, localDisplayName = localDisplayName' ct}
           allowContent = \case
             MCText _ -> True

apps/simplex-broadcast-bot/src/Broadcast/Options.hs

@@ -7,6 +7,7 @@
 module Broadcast.Options where
 
 import Data.Maybe (fromMaybe)
+import Data.Text (Text)
 import Options.Applicative
 import Simplex.Chat.Bot.KnownContacts
 import Simplex.Chat.Controller (updateStr, versionNumber, versionString)
@@ -15,14 +16,14 @@ import Simplex.Chat.Options (ChatCmdLog (..), ChatOpts (..), CoreChatOpts, coreC
 data BroadcastBotOpts = BroadcastBotOpts
   { coreOptions :: CoreChatOpts,
     publishers :: [KnownContact],
-    welcomeMessage :: String,
-    prohibitedMessage :: String
+    welcomeMessage :: Text,
+    prohibitedMessage :: Text
   }
 
-defaultWelcomeMessage :: [KnownContact] -> String
+defaultWelcomeMessage :: [KnownContact] -> Text
 defaultWelcomeMessage ps = "Hello! I am a broadcast bot.\nI broadcast messages to all connected users from " <> knownContactNames ps <> "."
 
-defaultProhibitedMessage :: [KnownContact] -> String
+defaultProhibitedMessage :: [KnownContact] -> Text
 defaultProhibitedMessage ps = "Sorry, only these users can broadcast messages: " <> knownContactNames ps <> ". Your message is deleted."
 
 broadcastBotOpts :: FilePath -> FilePath -> Parser BroadcastBotOpts