terminal: edit and delete messages for everyone on the chat (#497)

src/Simplex/Chat.hs

@@ -364,6 +364,15 @@ processChatCommand = \case
     quotedItemId <- withStore $ \st -> getDirectChatItemIdByText st userId contactId msgDir (safeDecodeUtf8 quotedMsg)
     let mc = MCText $ safeDecodeUtf8 msg
     processChatCommand $ APISendMessageQuote CTDirect contactId quotedItemId mc
+  DeleteMessage cName deletedMsg -> withUser $ \User {userId} -> do
+    contactId <- withStore $ \st -> getContactIdByName st userId cName
+    deletedItemId <- withStore $ \st -> getDirectChatItemIdByText st userId contactId SMDSnd (safeDecodeUtf8 deletedMsg)
+    processChatCommand $ APIDeleteChatItem CTDirect contactId deletedItemId CIDMBroadcast
+  EditMessage cName editedMsg msg -> withUser $ \User {userId} -> do
+    contactId <- withStore $ \st -> getContactIdByName st userId cName
+    editedItemId <- withStore $ \st -> getDirectChatItemIdByText st userId contactId SMDSnd (safeDecodeUtf8 editedMsg)
+    let mc = MCText $ safeDecodeUtf8 msg
+    processChatCommand $ APIUpdateChatItem CTDirect contactId editedItemId mc
   NewGroup gProfile -> withUser $ \user -> do
     gVar <- asks idsDrg
     CRGroupCreated <$> withStore (\st -> createNewGroup st gVar user gProfile)
@@ -444,6 +453,15 @@ processChatCommand = \case
     quotedItemId <- withStore $ \st -> getGroupChatItemIdByText st user groupId cName (safeDecodeUtf8 quotedMsg)
     let mc = MCText $ safeDecodeUtf8 msg
     processChatCommand $ APISendMessageQuote CTGroup groupId quotedItemId mc
+  DeleteGroupMessage gName deletedMsg -> withUser $ \user@User {localDisplayName} -> do
+    groupId <- withStore $ \st -> getGroupIdByName st user gName
+    deletedItemId <- withStore $ \st -> getGroupChatItemIdByText st user groupId (Just localDisplayName) (safeDecodeUtf8 deletedMsg)
+    processChatCommand $ APIDeleteChatItem CTGroup groupId deletedItemId CIDMBroadcast
+  EditGroupMessage gName editedMsg msg -> withUser $ \user@User {localDisplayName} -> do
+    groupId <- withStore $ \st -> getGroupIdByName st user gName
+    editedItemId <- withStore $ \st -> getGroupChatItemIdByText st user groupId (Just localDisplayName) (safeDecodeUtf8 editedMsg)
+    let mc = MCText $ safeDecodeUtf8 msg
+    processChatCommand $ APIUpdateChatItem CTGroup groupId editedItemId mc
   SendFile cName f -> withUser $ \user@User {userId} -> withChatLock $ do
     (fileSize, chSize) <- checkSndFile f
     contact <- withStore $ \st -> getContactByName st userId cName
@@ -1650,7 +1668,7 @@ chatCommandP =
     <|> ("/help files" <|> "/help file" <|> "/hf") $> ChatHelp HSFiles
     <|> ("/help groups" <|> "/help group" <|> "/hg") $> ChatHelp HSGroups
     <|> ("/help address" <|> "/ha") $> ChatHelp HSMyAddress
-    <|> ("/help replies" <|> "/hr") $> ChatHelp HSQuotes
+    <|> ("/help messages" <|> "/hm") $> ChatHelp HSMessages
     <|> ("/help" <|> "/h") $> ChatHelp HSMain
     <|> ("/group #" <|> "/group " <|> "/g #" <|> "/g ") *> (NewGroup <$> groupProfile)
     <|> ("/add #" <|> "/add " <|> "/a #" <|> "/a ") *> (AddMember <$> displayName <* A.space <*> displayName <*> memberRole)
@@ -1663,6 +1681,8 @@ chatCommandP =
     <|> A.char '#' *> (SendGroupMessage <$> displayName <* A.space <*> A.takeByteString)
     <|> (">#" <|> "> #") *> (SendGroupMessageQuote <$> displayName <* A.space <*> pure Nothing <*> quotedMsg <*> A.takeByteString)
     <|> (">#" <|> "> #") *> (SendGroupMessageQuote <$> displayName <* A.space <* optional (A.char '@') <*> (Just <$> displayName) <* A.space <*> quotedMsg <*> A.takeByteString)
+    <|> ("\\#" <|> "\\ #") *> (DeleteGroupMessage <$> displayName <* A.space <*> A.takeByteString)
+    <|> ("!#" <|> "! #") *> (EditGroupMessage <$> displayName <* A.space <*> quotedMsg <*> A.takeByteString)
     <|> ("/contacts" <|> "/cs") $> ListContacts
     <|> ("/connect " <|> "/c ") *> (Connect <$> ((Just <$> strP) <|> A.takeByteString $> Nothing))
     <|> ("/connect" <|> "/c") $> AddContact
@@ -1670,6 +1690,8 @@ chatCommandP =
     <|> A.char '@' *> (SendMessage <$> displayName <* A.space <*> A.takeByteString)
     <|> (">@" <|> "> @") *> sendMsgQuote (AMsgDirection SMDRcv)
     <|> (">>@" <|> ">> @") *> sendMsgQuote (AMsgDirection SMDSnd)
+    <|> ("\\@" <|> "\\ @") *> (DeleteMessage <$> displayName <* A.space <*> A.takeByteString)
+    <|> ("!@" <|> "! @") *> (EditMessage <$> displayName <* A.space <*> quotedMsg <*> A.takeByteString)
     <|> "/feed " *> (SendMessageBroadcast <$> A.takeByteString)
     <|> ("/file #" <|> "/f #") *> (SendGroupFile <$> displayName <* A.space <*> filePath)
     <|> ("/file @" <|> "/file " <|> "/f @" <|> "/f ") *> (SendFile <$> displayName <* A.space <*> filePath)

src/Simplex/Chat/Controller.hs

@@ -79,7 +79,7 @@ data ChatController = ChatController
     config :: ChatConfig
   }
 
-data HelpSection = HSMain | HSFiles | HSGroups | HSMyAddress | HSMarkdown | HSQuotes
+data HelpSection = HSMain | HSFiles | HSGroups | HSMyAddress | HSMarkdown | HSMessages
   deriving (Show, Generic)
 
 instance ToJSON HelpSection where
@@ -120,6 +120,8 @@ data ChatCommand
   | SendMessage ContactName ByteString
   | SendMessageQuote {contactName :: ContactName, msgDir :: AMsgDirection, quotedMsg :: ByteString, message :: ByteString}
   | SendMessageBroadcast ByteString
+  | DeleteMessage ContactName ByteString
+  | EditMessage {contactName :: ContactName, editedMsg :: ByteString, message :: ByteString}
   | NewGroup GroupProfile
   | AddMember GroupName ContactName GroupMemberRole
   | JoinGroup GroupName
@@ -131,6 +133,8 @@ data ChatCommand
   | ListGroups
   | SendGroupMessage GroupName ByteString
   | SendGroupMessageQuote {groupName :: GroupName, contactName_ :: Maybe ContactName, quotedMsg :: ByteString, message :: ByteString}
+  | DeleteGroupMessage GroupName ByteString
+  | EditGroupMessage {groupName :: ContactName, editedMsg :: ByteString, message :: ByteString}
   | SendFile ContactName FilePath
   | SendGroupFile GroupName FilePath
   | ReceiveFile FileTransferId (Maybe FilePath)

src/Simplex/Chat/Help.hs

@@ -7,7 +7,7 @@ module Simplex.Chat.Help
     filesHelpInfo,
     groupsHelpInfo,
     myAddressHelpInfo,
-    quotesHelpInfo,
+    messagesHelpInfo,
     markdownInfo,
   )
 where
@@ -83,7 +83,7 @@ chatHelpInfo =
       green "Create your address: " <> highlight "/address",
       "",
       green "Other commands:",
-      indent <> highlight "/help <topic>    " <> " - help on: files, groups, address, replies, smp_servers",
+      indent <> highlight "/help <topic>    " <> " - help on: messages, files, groups, address",
       indent <> highlight "/profile         " <> " - show / update user profile",
       indent <> highlight "/delete <contact>" <> " - delete contact and all messages with them",
       indent <> highlight "/contacts        " <> " - list contacts",
@@ -143,8 +143,8 @@ myAddressHelpInfo =
       "The commands may be abbreviated: " <> listHighlight ["/ad", "/da", "/sa", "/ac", "/rc"]
     ]
 
-quotesHelpInfo :: [StyledString]
-quotesHelpInfo =
+messagesHelpInfo :: [StyledString]
+messagesHelpInfo =
   map
     styleMarkdown
     [ green "Sending replies to messages",
@@ -152,7 +152,17 @@ quotesHelpInfo =
       indent <> highlight "> @alice (hi) <msg>      " <> " - to reply to alice's most recent message",
       indent <> highlight ">> @alice (hi) <msg>     " <> " - to quote user's most recent message to alice",
       indent <> highlight "> #team (hi) <msg>       " <> " - to quote most recent message in the group from any member",
-      indent <> highlight "> #team @alice (hi) <msg>" <> " - to quote alice's most recent message in the group #team"
+      indent <> highlight "> #team @alice (hi) <msg>" <> " - to quote alice's most recent message in the group #team",
+      "",
+      green "Deleting sent messages (for everyone)",
+      "To delete a message that starts with \"hi\":",
+      indent <> highlight "\\ @alice hi              " <> " - to delete your message to alice",
+      indent <> highlight "\\ #team hi               " <> " - to delete your message in the group #team",
+      "",
+      green "Editing sent messages",
+      "To edit a message that starts with \"hi\":",
+      indent <> highlight "! @alice (hi) <new msg>  " <> " - to edit your message to alice",
+      indent <> highlight "! #team (hi) <new msg>   " <> " - to edit your message in the group #team"
     ]
 
 markdownInfo :: [StyledString]

src/Simplex/Chat/Terminal/Input.hs

@@ -101,9 +101,9 @@ updateTermState ac tw (key, ms) ts@TerminalState {inputString = s, inputPosition
   _ -> ts
   where
     insertCharsWithContact cs
-      | null s && cs /= "@" && cs /= "#" && cs /= "/" && cs /= ">" =
+      | null s && cs /= "@" && cs /= "#" && cs /= "/" && cs /= ">" && cs /= "\\" && cs /= "!" =
         insertChars $ contactPrefix <> cs
-      | s == ">" && cs == " " =
+      | (s == ">" || s == "\\" || s == "!") && cs == " " =
         insertChars $ cs <> contactPrefix
       | otherwise = insertChars cs
     insertChars = ts' . if p >= length s then append else insert

src/Simplex/Chat/View.hs

@@ -60,7 +60,7 @@ responseToView testView = \case
     HSFiles -> filesHelpInfo
     HSGroups -> groupsHelpInfo
     HSMyAddress -> myAddressHelpInfo
-    HSQuotes -> quotesHelpInfo
+    HSMessages -> messagesHelpInfo
     HSMarkdown -> markdownInfo
   CRWelcome user -> chatWelcome user
   CRContactsList cs -> viewContactsList cs
@@ -207,7 +207,7 @@ viewItemUpdate chat ChatItem {chatDir, meta, content, quotedItem} = case chat of
       where
         from = ttyFromContactEdited c
         quote = maybe [] (directQuote chatDir) quotedItem
-    CIDirectSnd -> ["item updated"]
+    CIDirectSnd -> ["message updated"]
   GroupChat g -> case chatDir of
     CIGroupRcv GroupMember {localDisplayName = m} -> case content of
       CIRcvMsgContent mc -> viewReceivedMessage from quote meta mc
@@ -215,7 +215,7 @@ viewItemUpdate chat ChatItem {chatDir, meta, content, quotedItem} = case chat of
       where
         from = ttyFromGroupEdited g m
         quote = maybe [] (groupQuote g) quotedItem
-    CIGroupSnd -> ["item updated"]
+    CIGroupSnd -> ["message updated"]
   _ -> []
 
 viewItemDelete :: ChatInfo c -> ChatItem c d -> ChatItem c' d' -> [StyledString]
@@ -223,14 +223,14 @@ viewItemDelete chat ChatItem {chatDir, meta, content = deletedContent} ChatItem
   DirectChat Contact {localDisplayName = c} -> case (chatDir, deletedContent, toContent) of
     (CIDirectRcv, CIRcvMsgContent mc, CIRcvDeleted mode) -> case mode of
       CIDMBroadcast -> viewReceivedMessage (ttyFromContactDeleted c) [] meta mc
-      CIDMInternal -> ["item deleted"]
-    (CIDirectSnd, _, _) -> ["item deleted"]
+      CIDMInternal -> ["message deleted"]
+    (CIDirectSnd, _, _) -> ["message deleted"]
     _ -> []
   GroupChat g -> case (chatDir, deletedContent, toContent) of
     (CIGroupRcv GroupMember {localDisplayName = m}, CIRcvMsgContent mc, CIRcvDeleted mode) -> case mode of
       CIDMBroadcast -> viewReceivedMessage (ttyFromGroupDeleted g m) [] meta mc
-      CIDMInternal -> ["item deleted"]
-    (CIGroupSnd, _, _) -> ["item deleted"]
+      CIDMInternal -> ["message deleted"]
+    (CIGroupSnd, _, _) -> ["message deleted"]
     _ -> []
   _ -> []