fix

Author: gsanchietti

service/messages.go

@@ -344,6 +344,7 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 
 // resolveMatrixUser resolves an identifier to a valid Matrix user ID.
 // If the identifier is already a valid Matrix user ID (starts with @), it's returned as-is.
+// If the identifier is in format "username@domain", extracts the username part.
 // Otherwise, it tries to look up the identifier in the mapping store with the following logic:
 //   - First tries to match the identifier as the main number
 //   - If no match, tries to find the identifier in any entry's sub_numbers array
@@ -358,6 +359,12 @@ func (s *MessageService) resolveMatrixUser(identifier string) id.UserID {
 		return id.UserID(identifier)
 	}
 
+	// Extract username from "username@domain" format if present
+	if idx := strings.Index(identifier, "@"); idx > 0 {
+		identifier = identifier[:idx]
+		logger.Debug().Str("extracted_username", identifier).Msg("extracted username from user@domain format")
+	}
+
 	// Try to look up in mappings (e.g., phone number to Matrix user)
 	if entry, ok := s.getMapping(identifier); ok && entry.MatrixID != "" {
 		logger.Debug().Str("original_identifier", identifier).Str("resolved_user", entry.MatrixID).Msg("identifier resolved from mapping")

service/messages_cache_test.go

@@ -114,7 +114,7 @@ func TestResolveRoomIDToOtherIdentifierCacheBehavior(t *testing.T) {
 	svc.roomAliasesCache.Set(string(roomID), []string{"user1|user2"})
 
 	// Call resolveRoomIDToOtherIdentifier
-	result := svc.resolveRoomIDToOtherIdentifier(nil, roomID, myMatrixID)
+	result := svc.resolveRoomIDToOtherIdentifier(context.TODO(), roomID, myMatrixID)
 
 	// Should resolve to 201 (the mapped number for @user2:server)
 	assert.Equal(t, "201", result)

service/messages_test.go

@@ -328,7 +328,22 @@ func TestResolveMatrixUser_SubNumbers(t *testing.T) {
 		assert.Equal(t, "", string(result), "should return empty string if no mapping found")
 	})
 
-	// Test case 6: Case insensitivity
+	// Test case 6: Extract username from user@domain format - but still need to resolve via mapping
+	// This test verifies that the username extraction works for the identifier processing,
+	// but the actual resolution still depends on having a mapping with that number
+	t.Run("extract username from user@domain format", func(t *testing.T) {
+		svc := NewMessageService(nil, nil, NewTestConfig())
+		// When the auth service creates a mapping, it will use the user_name to look up
+		// But in resolveMatrixUser, we only look up by number or try to convert to int
+		// So we test that user@domain gets extracted to "user" but it won't resolve
+		// unless there's a numeric mapping. This is the core fix - preventing the
+		// "could not resolve" warning for user@domain format identifiers.
+		result := svc.resolveMatrixUser("[email protected]")
+		// Should return empty string since no mapping exists with that username
+		assert.Equal(t, "", string(result), "should extract username from user@domain format but return empty if no mapping")
+	})
+
+	// Test case 7: Case insensitive sub_number resolution
 	t.Run("case insensitive sub_number resolution", func(t *testing.T) {
 		svc := NewMessageService(nil, nil, NewTestConfig())
 		svc.SaveMapping(&models.MappingRequest{