Rely less on model.chatting

Author: easafe

src/Client/Im/Contacts.purs

@@ -78,10 +78,7 @@ setMessageStatus webSocket userId newStatus model =
       model
             { contacts = updatedContacts
             } /\
-            [ setIt
-                    userId
-                    (messageIdsUpdated <<< DM.maybe [] _.history $ SIC.findContact userId model.contacts)
-                    updatedContacts
+            [ setIt userId (messageIdsUpdated <<< DM.maybe [] _.history $ SIC.findContact userId model.contacts)
             ]
 
       where
@@ -94,16 +91,16 @@ setMessageStatus webSocket userId newStatus model =
             | needsUpdate entry = entry { status = newStatus }
             | otherwise = entry
 
-      updateContact userId contact
-            | contact.user.id == userId = contact { history = map updateStatus contact.history }
+      updateContact ui contact
+            | contact.user.id == ui = contact { history = map updateStatus contact.history }
             | otherwise = contact
 
-      setIt userId messages contacts = liftEffect do
+      setIt ui messages = liftEffect do
             CIW.sendPayload webSocket $ ChangeStatus
                   { status: newStatus
-                  , ids: [ Tuple userId messages ]
+                  , ids: [ Tuple ui messages ]
                   }
-            CIUN.updateTabCount userId contacts
+            CIUN.updateTabCount model.user.id updatedContacts
             pure Nothing
 
 -- | Update message status to unread upon openning the site or receveing from new contacts

test/Client/Im/Chat.purs

@@ -77,7 +77,7 @@ tests = do
             TU.test "sendMessage adds markdown image to history" do
                   date ← liftEffect $ map DateTimeWrapper EN.nowDateTime
                   let
-                        { chatting } = DT.fst <<< CIC.sendMessage 3 true (Image caption image) date webSocket $ model
+                        { chatting } = DT.fst <<< CIC.sendMessage (SU.fromJust model.chatting) true (Image caption image) date webSocket $ model
                               { selectedImage = Just image
                               , imageCaption = Just caption
                               }
@@ -88,7 +88,7 @@ tests = do
             TU.test "sendMessage resets input fields" do
                   date ← liftEffect $ map DateTimeWrapper EN.nowDateTime
                   let
-                        { selectedImage, imageCaption } = DT.fst <<< CIC.sendMessage 3 true content date webSocket $ model
+                        { selectedImage, imageCaption } = DT.fst <<< CIC.sendMessage (SU.fromJust model.chatting) true content date webSocket $ model
                               { selectedImage = Just image
                               , imageCaption = Just caption
                               }