fix(cr): only add accepted cr message when it was not accepted before

Fixes status-im/status-app#21043

Author: jrainville

protocol/messenger_contact_requests_test.go

@@ -671,8 +671,13 @@ func (s *MessengerContactRequestSuite) TestAliceSeesOnlyOneAcceptFromBob() {
 	s.acceptContactRequest(contactRequest, alice, bob)
 
 	// Accept contact request again
-	_, err := bob.AcceptContactRequest(context.Background(), &requests.AcceptContactRequest{ID: types.Hex2Bytes(contactRequest.ID), ContactID: contactRequest.From})
+	secondAcceptResp, err := bob.AcceptContactRequest(context.Background(), &requests.AcceptContactRequest{ID: types.Hex2Bytes(contactRequest.ID), ContactID: contactRequest.From})
 	s.Require().NoError(err)
+	s.Require().NotNil(secondAcceptResp)
+
+	// A repeated accept must not produce a duplicate "accepted" system message.
+	secondAcceptMutualStateUpdate := s.findFirstByContentType(secondAcceptResp.Messages(), protobuf.ChatMessage_SYSTEM_MESSAGE_MUTUAL_EVENT_ACCEPTED)
+	s.Require().Nil(secondAcceptMutualStateUpdate)
 
 	// Check we don't have extra messages on Alice's side
 	resp, err := WaitOnMessengerResponse(alice,

protocol/messenger_contacts.go

@@ -315,6 +315,7 @@ func (m *Messenger) updateAcceptedContactRequest(response *MessengerResponse, co
 		return nil, err
 	}
 
+	previouslyAccepted := contactRequest.ContactRequestState == common.ContactRequestStateAccepted
 	contactRequest.ContactRequestState = common.ContactRequestStateAccepted
 
 	err = m.persistence.SetContactRequestState(contactRequest.ID, contactRequest.ContactRequestState)
@@ -388,22 +389,24 @@ func (m *Messenger) updateAcceptedContactRequest(response *MessengerResponse, co
 	response.AddMessage(contactRequest)
 	response.AddContact(contact)
 
-	// Add mutual state update message for incoming contact request
-	clock, timestamp := chat.NextClockAndTimestamp(m.getTimesource())
-	updateMessage, err := m.prepareMutualStateUpdateMessage(contact.ID, contacts.MutualStateUpdateTypeAdded, clock, timestamp, true)
-	if err != nil {
-		return nil, err
-	}
+	// Add mutual state update message only on first acceptance.
+	if !previouslyAccepted {
+		clock, timestamp := chat.NextClockAndTimestamp(m.getTimesource())
+		updateMessage, err := m.prepareMutualStateUpdateMessage(contact.ID, contacts.MutualStateUpdateTypeAdded, clock, timestamp, true)
+		if err != nil {
+			return nil, err
+		}
 
-	err = m.prepareMessage(updateMessage, m.httpServer)
-	if err != nil {
-		return nil, err
-	}
-	err = m.persistence.SaveMessages([]*common.Message{updateMessage})
-	if err != nil {
-		return nil, err
+		err = m.prepareMessage(updateMessage, m.httpServer)
+		if err != nil {
+			return nil, err
+		}
+		err = m.persistence.SaveMessages([]*common.Message{updateMessage})
+		if err != nil {
+			return nil, err
+		}
+		response.AddMessage(updateMessage)
 	}
-	response.AddMessage(updateMessage)
 	response.AddChat(chat)
 
 	return response, nil

protocol/messenger_handler.go

@@ -912,6 +912,7 @@ func (m *Messenger) handleAcceptContactRequestMessage(state *ReceivedMessageStat
 	previouslyAccepted := request != nil && request.ContactRequestState == common.ContactRequestStateAccepted
 
 	contact := state.CurrentMessageState.Contact
+	wasMutual := contact.Mutual()
 
 	// The request message will be added to the response here
 	processingResponse, err := m.handleAcceptContactRequest(state.Response, contact, request, clock)
@@ -941,8 +942,8 @@ func (m *Messenger) handleAcceptContactRequestMessage(state *ReceivedMessageStat
 			chat.Active = true
 		}
 
-		// Add mutual state update message for incoming contact request
-		if !previouslyAccepted {
+		// Add mutual state update message only when transitioning to mutual.
+		if !wasMutual && contact.Mutual() && !previouslyAccepted {
 			clock, timestamp := chat.NextClockAndTimestamp(m.getTimesource())
 
 			updateMessage, err := m.prepareMutualStateUpdateMessage(contact.ID, contacts.MutualStateUpdateTypeAdded, clock, timestamp, false)