Closes #296

Author: easafe

src/Client/Im/Chat.purs

@@ -539,3 +539,16 @@ editMessage message id model =
       setIt = liftEffect do
             input ← chatInput model.chatting
             CCD.setValue input (spy "msg" message)
+
+deleteMessage ∷ Int → WebSocket -> ImModel → NoMessages
+deleteMessage id webSocket model =
+      model
+            { toggleContextMenu = HideContextMenu
+            } /\ [ deleteIt ]
+      where
+      chatting = SU.fromJust model.chatting
+
+      deleteIt = do
+            liftEffect <<< CIW.sendPayload webSocket $ DeletedMessage { id, userId : (model.contacts !@ chatting).user.id }
+            pure Nothing
+

src/Client/Im/Main.purs

@@ -146,6 +146,7 @@ update st model =
             FocusInput elementId → focusInput elementId model
             QuoteMessage message et → CIC.quoteMessage message et model
             EditMessage message id → CIC.editMessage message id model
+            DeleteMessage id → CIC.deleteMessage id webSocket model
             CheckTyping text → CIC.checkTyping text (EU.unsafePerformEffect EN.nowDateTime) webSocket model
             NoTyping id → F.noMessages $ CIC.updateTyping id false model
             TypingId id → F.noMessages model { typingIds = DA.snoc model.typingIds $ SC.coerce id }

src/Client/Im/WebSocket/Events.purs

@@ -38,7 +38,7 @@ import Server.WebSocket (WebSocketConnection)
 import Shared.Availability (Availability(..))
 import Shared.DateTime (DateTimeWrapper(..))
 import Shared.Experiments.Types as SET
-import Shared.Im.Types (ClientMessagePayload, Contact, FullWebSocketPayloadClient(..), HistoryMessage, ImMessage(..), MessageStatus(..), RetryableRequest(..), TimeoutIdWrapper(..), WebSocketPayloadClient(..), WebSocketPayloadServer(..), ImModel, EditedMessagePayload)
+import Shared.Im.Types (ClientMessagePayload, Contact, EditedMessagePayload, FullWebSocketPayloadClient(..), HistoryMessage, ImMessage(..), ImModel, MessageStatus(..), RetryableRequest(..), TimeoutIdWrapper(..), WebSocketPayloadClient(..), WebSocketPayloadServer(..), DeletedMessagePayload)
 import Shared.Json as SJ
 import Shared.Options.MountPoint (experimentsId, imId, profileId)
 import Shared.Privilege (Privilege)
@@ -171,6 +171,7 @@ receiveMessage webSocket isFocused payload model = case payload of
       ServerReceivedMessage rm → receiveAcknowledgement rm model
       NewIncomingMessage ni → receiveIncomingMessage webSocket isFocused ni model
       NewEditedMessage ni → receiveEditedMessage webSocket isFocused ni model
+      NewDeletedMessage nd → receiveDeletedMessage nd model
       ContactTyping tp → receiveTyping tp model
       CurrentPrivileges kp → receivePrivileges kp model
       CurrentHash newHash → receiveHash newHash model
@@ -201,6 +202,16 @@ receiveAcknowledgement received model = F.noMessages model
             | history.id == received.previousId = history { id = received.id, status = Received }
             | otherwise = history
 
+-- | Remove a message from contact's history
+receiveDeletedMessage ∷ DeletedMessagePayload → ImModel → NoMessages
+receiveDeletedMessage deleted model = F.noMessages model
+      { contacts = rm <$> model.contacts
+      }
+      where
+      rm contact
+            | contact.user.id == deleted.userId = contact { history = DA.filter ((deleted.id /= _) <<< _.id) contact.history }
+            | otherwise = contact
+
 -- | A new message from others users or sent by the logged user with another connection
 receiveIncomingMessage ∷ WebSocket → Boolean → ClientMessagePayload → ImModel → NextMessage
 receiveIncomingMessage webSocket isFocused payload model =

src/Server/Im/Action.purs

@@ -109,6 +109,9 @@ editMessage loggedUserId userId messageId content = do
       else
             pure $ Left UserUnavailable
 
+unsendMessage ∷ ∀ r. Int → Int → Int → BaseEffect { configuration ∷ Configuration, pool ∷ Pool | r } Unit
+unsendMessage loggedUserId userId messageId = SID.deleteMessage loggedUserId userId messageId
+
 markdownPrivileges ∷ ∀ r. Int → BaseEffect { pool ∷ Pool | r } (Set Privilege)
 markdownPrivileges loggedUserId = (DST.fromFoldable <<< map _.feature) <$> SID.markdownPrivileges loggedUserId
 

src/Server/Im/Database.purs

@@ -278,6 +278,12 @@ canEditMessage loggedUserId messageId =
                   # from messages
                   # wher (_id .=. messageId .&&. _sender .=. loggedUserId)
 
+deleteMessage ∷ ∀ r. Int → Int → Int -> BaseEffect { pool ∷ Pool | r } Unit
+deleteMessage loggedUserId userId messageId = SD.execute $
+            delete
+                  # from messages
+                  # wher (_id .=. messageId .&&. _sender .=. loggedUserId .&&. _recipient .=. userId)
+
 insertMessage ∷ ∀ r. Int → Int → String → BaseEffect { pool ∷ Pool | r } Int
 insertMessage loggedUserId recipient content = SD.withTransaction $ \connection → do
       void $ SD.singleWith connection $ select (insert_history (loggedUserId /\ recipient) # as u)

src/Server/WebSocket/Events.purs

@@ -52,7 +52,7 @@ import Server.WebSocket as SW
 import Shared.Availability (Availability(..))
 import Shared.DateTime (DateTimeWrapper(..))
 import Shared.DateTime as SDT
-import Shared.Im.Types (AfterLogout(..), FullWebSocketPayloadClient(..), MessageError(..), MessageStatus, OutgoingRecord, WebSocketPayloadClient(..), WebSocketPayloadServer(..), EditedRecord)
+import Shared.Im.Types (AfterLogout(..), EditedRecord, FullWebSocketPayloadClient(..), MessageError(..), MessageStatus, OutgoingRecord, WebSocketPayloadClient(..), WebSocketPayloadServer(..), DeletedRecord)
 import Shared.Json as SJ
 import Shared.Resource (updateHash)
 import Shared.ResponseError (DatabaseError, ResponseError(..))
@@ -166,6 +166,7 @@ handleMessage payload = do
             Ping ping → sendPong context.token context.loggedUserId context.allUsersAvailabilityRef ping
             OutgoingMessage message → sendOutgoingMessage context.token context.loggedUserId allUsersAvailability message
             EditedMessage message → sendEditedMessage context.token context.loggedUserId allUsersAvailability message
+            DeletedMessage message → unsendMessage context.token context.loggedUserId allUsersAvailability message
             ChangeStatus changes → sendStatusChange context.token context.loggedUserId allUsersAvailability changes
             Typing { id } → sendTyping context.loggedUserId allUsersAvailability id
             SetOnline → setOnline context.loggedUserId
@@ -341,14 +342,14 @@ sendEditedMessage token loggedUserId allUsersAvailability edited = do
       case processed of
             Right content → do
                   let receipientUserAvailability = DH.lookup edited.userId allUsersAvailability
-                  withConnections receipientUserAvailability (sendRecipient edited.id content)
+                  withConnections receipientUserAvailability (sendRecipient content)
 
                   let loggedUserConnections = (SU.fromJust loggedUserAvailability).connections
                   let senderConnection = DH.values $ DH.filterKeys (token == _) loggedUserConnections
-                  DF.traverse_ (acknowledgeMessage edited.id) senderConnection
+                  DF.traverse_ acknowledgeMessage senderConnection
 
                   let otherConnections = DH.values $ DH.filterKeys (token /= _) loggedUserConnections
-                  DF.traverse_ (sendRecipient edited.id content) otherConnections
+                  DF.traverse_ (sendRecipient content) otherConnections
             Left UserUnavailable →
                   sendLoggedUser <<< Content $ ContactUnavailable
                         { userId: edited.userId
@@ -360,25 +361,47 @@ sendEditedMessage token loggedUserId allUsersAvailability edited = do
                         , temporaryMessageId: Just edited.id
                         }
       where
-      sendRecipient messageId content connection =
+      sendRecipient content connection =
             sendWebSocketMessage connection <<< Content $ NewEditedMessage
-                  { id: messageId
+                  { id: edited.id
                   , senderId: loggedUserId
                   , recipientId: edited.userId
                   , content
                   }
 
       loggedUserAvailability = DH.lookup loggedUserId allUsersAvailability
 
-      acknowledgeMessage messageId connection = sendWebSocketMessage connection <<< Content $ ServerReceivedMessage
-            { previousId: messageId
-            , id: messageId
+      acknowledgeMessage connection = sendWebSocketMessage connection <<< Content $ ServerReceivedMessage
+            { previousId: edited.id
+            , id: edited.id
             , userId: edited.userId
             }
 
       sendLoggedUser payload = do
             withConnections loggedUserAvailability $ \connection → sendWebSocketMessage connection payload
 
+unsendMessage ∷ String → Int → HashMap Int UserAvailability → DeletedRecord → WebSocketEffect
+unsendMessage token loggedUserId allUsersAvailability deleted = do
+      SIA.unsendMessage loggedUserId deleted.userId deleted.id
+
+      let receipientUserAvailability = DH.lookup deleted.userId allUsersAvailability
+      withConnections receipientUserAvailability (send loggedUserId)
+
+      let loggedUserConnections = (SU.fromJust loggedUserAvailability).connections
+      let senderConnection = DH.values $ DH.filterKeys (token == _) loggedUserConnections
+      DF.traverse_ (send deleted.userId) senderConnection
+
+      let otherConnections = DH.values $ DH.filterKeys (token /= _) loggedUserConnections
+      DF.traverse_ (send deleted.userId) otherConnections
+      where
+      send userId connection =
+            sendWebSocketMessage connection <<< Content $ NewDeletedMessage
+                  { id: deleted.id
+                  , userId
+                  }
+
+      loggedUserAvailability = DH.lookup loggedUserId allUsersAvailability
+
 makeUserAvailabity ∷ HashMap String WebSocketConnection → Either String String → Boolean → DateTime → Availability → UserAvailability
 makeUserAvailabity connections token isActive lastSeen previousAvailability =
       { lastSeen

src/Shared/Im/Types.purs

@@ -13,16 +13,11 @@ import Data.Either (Either(..))
 import Data.Enum (class BoundedEnum, class Enum, Cardinality(..))
 import Data.Enum as DE
 import Data.Generic.Rep (class Generic)
-import Data.Hashable (class Hashable)
-import Data.Hashable as HS
 import Data.Int as DI
 import Data.Maybe (Maybe(..))
 import Data.Maybe as DM
 import Data.Maybe.First (First)
 import Data.Show.Generic as DGRS
-import Data.String.Regex as DSRG
-import Data.String.Regex.Flags (noFlags)
-import Data.String.Regex.Unsafe as DSRU
 import Data.Tuple (Tuple)
 import Droplet.Language (class FromValue, class ToValue)
 import Droplet.Language as DL
@@ -33,7 +28,7 @@ import Foreign.Object as FO
 import Payload.Client.QueryParams (class EncodeQueryParam)
 import Payload.Server.QueryParams (class DecodeQueryParam, DecodeError(..))
 import Shared.DateTime (DateTimeWrapper(..))
-import Shared.Experiments.Types (Experiment)
+
 import Shared.Privilege (Privilege)
 import Shared.Resource (Bundle)
 import Shared.ResponseError (DatabaseError)
@@ -72,6 +67,10 @@ type EditedMessagePayload = BasicMessage
       , senderId ∷ Int
       )
 
+type DeletedMessagePayload = BasicMessage
+      ( userId ∷ Int
+      )
+
 type BaseContact fields =
       { -- except for the last few messages, chat history is loaded when clicking on a contact for the first time
         shouldFetchChatHistory ∷ Boolean
@@ -305,6 +304,7 @@ data ImMessage
       | FocusInput ElementId
       | QuoteMessage String (Either Touch (Maybe Event))
       | EditMessage String Int
+      | DeleteMessage Int
       | FocusCurrentSuggestion
       | EnterBeforeSendMessage Event
       | ForceBeforeSendMessage
@@ -359,6 +359,7 @@ data WebSocketPayloadServer
       | Typing { id ∷ Int }
       | OutgoingMessage OutgoingRecord
       | EditedMessage EditedRecord
+      | DeletedMessage DeletedRecord
       | ChangeStatus
               { status ∷ MessageStatus
               , ids ∷ Array (Tuple Int (Array Int))
@@ -377,6 +378,8 @@ type OutgoingRecord =
 
 type EditedRecord = { id ∷ Int, userId ∷ Int, content ∷ MessageContent }
 
+type DeletedRecord = { id ∷ Int, userId ∷ Int }
+
 type AvailabilityStatus = Array { id ∷ Int, status ∷ Availability }
 
 data FullWebSocketPayloadClient
@@ -389,6 +392,7 @@ data WebSocketPayloadClient
       | CurrentPrivileges { karma ∷ Int, privileges ∷ Array Privilege }
       | NewIncomingMessage ClientMessagePayload
       | NewEditedMessage EditedMessagePayload
+      | NewDeletedMessage DeletedMessagePayload
       | ContactTyping { id ∷ Int }
       | ServerReceivedMessage
               { previousId ∷ Int

src/Shared/Im/View/ChatHistory.purs

@@ -91,6 +91,7 @@ chatHistory model@{ user: { id: loggedUserId, messageTimestamps, joined, tempora
                                                         , HE.div [ HA.class' { "user-menu in-message": true, visible: isContextMenuVisible, "menu-up": isContextMenuVisible && bottomMessage id } ]
                                                                 [ HE.div [ HA.class' "user-menu-item menu-item-heading", HA.onClick (QuoteMessage content (Right Nothing)) ] "Reply"
                                                                 , HE.div [ HA.class' { "user-menu-item menu-item-heading": true, "hidden": sender /= model.user.id || status < Received }, HA.onClick $ EditMessage content id ] "Edit"
+                                                                , HE.div [ HA.class' { "user-menu-item menu-item-heading": true, "hidden": sender /= model.user.id || status < Received }, HA.onClick $ DeleteMessage id ] "Unsend"
                                                                 ]
                                                         ]
                                                 ]