fix: reformat messages

Author: gsanchietti

models/messages.go

@@ -45,15 +45,6 @@ type SMS struct {
 }
 
 // Message is a helper struct for internal use.
-type Message struct {
-	ID          string
-	SendingDate string
-	Sender      string
-	Recipient   string
-	Text        string
-	ContentType string
-	StreamID    string
-}
 
 // PushTokenReportRequest mirrors the Acrobits push token reporter POST JSON schema.
 type PushTokenReportRequest struct {

service/messages.go

@@ -139,10 +139,8 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 		logger.Error().Str("user_id", string(userID)).Err(err).Msg("failed to list joined rooms")
 	} else {
 		logger.Debug().Str("user_id", string(userID)).Int("joined_room_count", len(rooms)).Msg("fetched joined rooms")
-
 		// Print each joined room (stdout) and also log them for debug
 		for _, r := range rooms {
-			fmt.Println(r)
 			logger.Debug().Str("room_id", string(r)).Msg("joined room")
 		}
 	}
@@ -170,54 +168,65 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 			if evt.Type != event.EventMessage {
 				continue
 			}
-			msg := convertEvent(evt)
+			// 			return models.Message{
+			// 	ID:          string(evt.ID),
+			// 	SendingDate: sendingDate,
+			// 	Sender:      string(evt.Sender),
+			// 	Recipient:   string(evt.RoomID),
+			// 	Text:        body,
+			// 	ContentType: contentType,
+			// 	StreamID:    string(evt.RoomID),
+			// }
+
+			// Debug entire raw event JSON for troubleshooting
+			if b, err := evt.MarshalJSON(); err != nil {
+				logger.Debug().Str("event", string(b)).Msg("processing event")
+			} else {
+				logger.Debug().Err(err).Msg("failed to marshal event for debug")
+			}
+			body := ""
+			if b, ok := evt.Content.Raw["body"].(string); ok {
+				body = b
+			}
+
+			sms := models.SMS{
+				SMSID:       string(evt.ID),
+				SendingDate: time.UnixMilli(evt.Timestamp).UTC().Format(time.RFC3339),
+				SMSText:     body,
+				ContentType: "text/plain",
+				// StreamID:    msg.StreamID,
+			}
 
 			// Determine if I sent the message
-			senderMatrixID := msg.Sender
+			senderMatrixID := string(evt.Sender)
 			isSent := isSentBy(senderMatrixID, string(userID))
 
 			// Remap sender to identifier (e.g. "202" or "91201")
-			msg.Sender = string(s.resolveMatrixUser(senderMatrixID))
+			sms.Sender = string(s.resolveMatrixIDToIdentifier(senderMatrixID))
 
 			// Determine Recipient
 			if isSent {
 				// I sent it. Recipient is the other person in the room.
 				other := s.resolveRoomIDToOtherIdentifier(ctx, evt.RoomID, string(userID))
 				if other != "" {
-					msg.Recipient = other
+					sms.Recipient = other
 				}
-				// If other not found, msg.Recipient remains RoomID (default from convertEvent)
+				sent = append(sent, sms)
+
 			} else {
 				// I received it. Recipient is me.
-				msg.Recipient = callerIdentifier
-			}
+				sms.Recipient = callerIdentifier
+				received = append(received, sms)
 
-			// Convert internal Message to SMS
-			sms := models.SMS{
-				SMSID:       msg.ID,
-				SendingDate: msg.SendingDate,
-				SMSText:     msg.Text,
-				ContentType: msg.ContentType,
-				StreamID:    msg.StreamID,
 			}
-
 			// Debug each processed message
 			logger.Debug().
-				Str("event_id", msg.ID).
-				Str("room_id", msg.StreamID).
-				Str("sender", msg.Sender).
-				Str("recipient", msg.Recipient).
+				Str("sender", sms.Sender).
+				Str("recipient", sms.Recipient).
 				Bool("is_sent", isSent).
 				Interface("sms", sms).
 				Msg("processed message from sync")
 
-			if isSent {
-				sms.Recipient = msg.Recipient
-				sent = append(sent, sms)
-			} else {
-				sms.Sender = msg.Sender
-				received = append(received, sms)
-			}
 		}
 	}
 
@@ -498,28 +507,6 @@ func isSentBy(sender, username string) bool {
 	return strings.EqualFold(normalizeMatrixID(sender), normalizeMatrixID(username))
 }
 
-func convertEvent(evt *event.Event) models.Message {
-	body := ""
-	if b, ok := evt.Content.Raw["body"].(string); ok {
-		body = b
-	}
-	contentType := "text/plain"
-	if mt, ok := evt.Content.Raw["msgtype"].(string); ok {
-		contentType = mt
-	}
-
-	sendingDate := time.UnixMilli(evt.Timestamp).UTC().Format(time.RFC3339)
-	return models.Message{
-		ID:          string(evt.ID),
-		SendingDate: sendingDate,
-		Sender:      string(evt.Sender),
-		Recipient:   string(evt.RoomID),
-		Text:        body,
-		ContentType: contentType,
-		StreamID:    string(evt.RoomID),
-	}
-}
-
 func mapAuthErr(err error) error {
 	if errors.Is(err, ErrAuthentication) {
 		return err