fix

Author: gsanchietti

service/messages.go

@@ -146,15 +146,11 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 		}
 	}
 
-	// The Validate function already matched the senderStr, so use it directly
-	// From the returned mappings, the first one should be the authenticated user
-	var senderMatrix string
-	if len(mappings) > 0 {
-		senderMatrix = strings.TrimSpace(mappings[0].MatrixID)
-	}
+	// Resolve sender to Matrix ID using mappings
+	senderMatrix := s.resolveMatrixUser(req.From)
 	if senderMatrix == "" {
-		logger.Error().Str("sender", senderStr).Msg("auth returned empty MatrixID")
-		return nil, ErrInvalidSender
+		logger.Warn().Str("from", req.From).Msg("resolved to empty Matrix user ID")
+		return nil, ErrAuthentication
 	}
 
 	recipientStr := strings.TrimSpace(req.To)
@@ -163,35 +159,27 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 		return nil, ErrInvalidRecipient
 	}
 
-	// Resolve sender to a valid Matrix user ID
-	sender := s.resolveMatrixUser(senderMatrix)
-	if sender == "" {
-		logger.Warn().Str("sender", senderMatrix).Msg("sender is not a valid Matrix user ID")
-		return nil, ErrInvalidSender
-	}
-
 	// Resolve recipient to a valid Matrix user ID
-	recipient := s.resolveMatrixUser(recipientStr)
-	if recipient == "" {
+	recipientMatrix := s.resolveMatrixUser(recipientStr)
+	if recipientMatrix == "" {
 		logger.Warn().Str("recipient", recipientStr).Msg("recipient is not a valid Matrix user ID")
 		return nil, ErrInvalidRecipient
 	}
 
-	logger.Debug().Str("sender", string(sender)).Str("recipient", string(recipient)).Msg("resolved sender and recipient to Matrix user IDs")
+	logger.Debug().Str("sender", string(senderMatrix)).Str("recipient", string(recipientMatrix)).Msg("resolved sender and recipient to Matrix user IDs")
 
 	// For 1-to-1 messaging, ensure a direct room exists between sender and recipient
-	roomID, err := s.ensureDirectRoom(ctx, sender, recipient)
+	roomID, err := s.ensureDirectRoom(ctx, senderMatrix, recipientMatrix)
 	if err != nil {
-		logger.Error().Str("sender", string(sender)).Str("recipient", string(recipient)).Err(err).Msg("failed to ensure direct room")
+		logger.Error().Str("sender", string(senderMatrix)).Str("recipient", string(recipientMatrix)).Err(err).Msg("failed to ensure direct room")
 		return nil, err
 	}
 
-	logger.Debug().Str("sender", string(sender)).Str("recipient", string(recipient)).Str("room_id", string(roomID)).Msg("sending message to direct room")
-
+	logger.Debug().Str("sender", string(senderMatrix)).Str("recipient", string(recipientMatrix)).Str("room_id", string(roomID)).Msg("sending message to direct room")
 	// Ensure the sender is a member of the room (in case join failed during room creation)
-	_, err = s.matrixClient.JoinRoom(ctx, sender, roomID)
+	_, err = s.matrixClient.JoinRoom(ctx, senderMatrix, roomID)
 	if err != nil {
-		logger.Error().Str("sender", string(sender)).Str("room_id", string(roomID)).Err(err).Msg("failed to join room")
+		logger.Error().Str("sender", string(senderMatrix)).Str("room_id", string(roomID)).Err(err).Msg("failed to join room")
 		return nil, fmt.Errorf("send message: %w", err)
 	}
 
@@ -200,13 +188,13 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 		Body:    req.Body,
 	}
 
-	resp, err := s.matrixClient.SendMessage(ctx, sender, roomID, content)
+	resp, err := s.matrixClient.SendMessage(ctx, senderMatrix, roomID, content)
 	if err != nil {
-		logger.Error().Str("sender", string(sender)).Str("room_id", string(roomID)).Err(err).Msg("failed to send message")
+		logger.Error().Str("sender", string(senderMatrix)).Str("room_id", string(roomID)).Err(err).Msg("failed to send message")
 		return nil, fmt.Errorf("send message: %w", mapAuthErr(err))
 	}
 
-	logger.Debug().Str("sender", string(sender)).Str("room_id", string(roomID)).Str("event_id", string(resp.EventID)).Msg("message sent successfully")
+	logger.Debug().Str("sender", string(senderMatrix)).Str("room_id", string(roomID)).Str("event_id", string(resp.EventID)).Msg("message sent successfully")
 	return &models.SendMessageResponse{ID: string(resp.EventID)}, nil
 }