fix: simply fetch logic

Author: gsanchietti

README.md

@@ -81,4 +81,5 @@ Implemented APIs:
 
 The following features are not yet implemented:
 
-- implement password validation on send messages, currently the password is ignored
+- sendMessage: implement password validation on send messages, currently the password is ignored
+- fetchMessages: implement filtering messages by timestamp, currently last 100 messages are fetched

matrix/client.go

@@ -98,12 +98,11 @@ func (mc *MatrixClient) SendMessage(ctx context.Context, userID id.UserID, roomI
 }
 
 // Sync performs a sync for the specified user to fetch messages.
-// If filterAfterEventID is provided (non-empty), uses post-processing to filter events.
-func (mc *MatrixClient) Sync(ctx context.Context, userID id.UserID, since, filterAfterEventID string) (*mautrix.RespSync, error) {
+func (mc *MatrixClient) Sync(ctx context.Context, userID id.UserID) (*mautrix.RespSync, error) {
 	mc.mu.Lock()
 	defer mc.mu.Unlock()
 
-	logger.Debug().Str("user_id", string(userID)).Str("since", since).Str("filter_after_event_id", filterAfterEventID).Msg("matrix: performing sync")
+	logger.Debug().Str("user_id", string(userID)).Msg("matrix: performing sync")
 
 	mc.cli.UserID = userID
 
@@ -127,37 +126,12 @@ func (mc *MatrixClient) Sync(ctx context.Context, userID id.UserID, since, filte
 	logger.Debug().Str("user_id", string(userID)).Str("filter", filterJSON).Msg("matrix: using message filter for sync")
 
 	// The SyncRequest method signature: SyncRequest(ctx, timeoutMS, since, filter, fullState, setPresence)
-	resp, err := mc.cli.SyncRequest(ctx, 30000, since, filterJSON, false, event.PresenceOnline)
+	resp, err := mc.cli.SyncRequest(ctx, 30000, "", filterJSON, false, event.PresenceOnline)
 	if err != nil {
 		logger.Error().Str("user_id", string(userID)).Err(err).Msg("matrix: sync failed")
 		return nil, err
 	}
 
-	// Post-process: If filterAfterEventID is provided, filter room timelines to only include events after it
-	// This is necessary because the Matrix spec doesn't support server-side filtering by event ID
-	if filterAfterEventID != "" {
-		logger.Debug().Str("user_id", string(userID)).Str("filter_after_event_id", filterAfterEventID).Msg("matrix: filtering sync results by event ID")
-		for roomID, room := range resp.Rooms.Join {
-			foundEvent := false
-			// Find the index of the target event
-			for j, evt := range room.Timeline.Events {
-				if string(evt.ID) == filterAfterEventID {
-					// Keep only events after this one
-					room.Timeline.Events = room.Timeline.Events[j+1:]
-					resp.Rooms.Join[roomID] = room
-					logger.Debug().Str("user_id", string(userID)).Str("room_id", roomID.String()).Int("events_removed", j+1).Msg("matrix: filtered room timeline")
-					foundEvent = true
-					break
-				}
-			}
-			if !foundEvent && len(room.Timeline.Events) > 0 {
-				// Event not found in this timeline window - the requested event is older than what we got
-				// Keep all events since they're all newer than the requested event
-				logger.Debug().Str("user_id", string(userID)).Str("room_id", roomID.String()).Msg("matrix: filter event not found in timeline, keeping all events")
-			}
-		}
-	}
-
 	logger.Debug().Str("user_id", string(userID)).Int("rooms", len(resp.Rooms.Join)).Msg("matrix: sync completed")
 	return resp, nil
 }

service/messages.go

@@ -125,35 +125,21 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMessagesRequest) (*models.FetchMessagesResponse, error) {
 	logger.Debug().Interface("request", req).Msg("fetch messages request received")
 
-	// The user to impersonate is taken from the 'Username' field.
+	// The username sent by the app is always an extension number like 91201
 	userID := s.resolveMatrixUser(strings.TrimSpace(req.Username))
 	if userID == "" {
 		logger.Warn().Msg("fetch messages: empty user ID")
 		return nil, ErrAuthentication
 	}
 
-	since := req.LastID
-	filterAfterEventID := ""
+	logger.Debug().Str("user_id", string(userID)).Msg("syncing messages from matrix")
 
-	// Acrobits might send a Matrix Event ID (starts with $) as last_id.
-	// Matrix Sync requires a stream token (usually starts with s).
-	// If we get an Event ID, we must perform an initial sync (empty since)
-	// and let the Matrix client filter the results to return only messages after that event.
-	if strings.HasPrefix(since, "$") {
-		logger.Debug().Str("last_id", since).Msg("received event ID as last_id, performing initial sync with event filtering")
-		filterAfterEventID = since
-		since = ""
-	}
-
-	logger.Debug().Str("user_id", string(userID)).Str("since", since).Msg("syncing messages from matrix")
-
-	resp, err := s.matrixClient.Sync(ctx, userID, since, filterAfterEventID)
+	resp, err := s.matrixClient.Sync(ctx, userID)
 	if err != nil {
 		// If the token is invalid (e.g. expired or from a different session), retry with a full sync.
 		if strings.Contains(err.Error(), "Invalid stream token") || strings.Contains(err.Error(), "M_UNKNOWN") {
 			logger.Warn().Err(err).Msg("invalid stream token, retrying with full sync")
-			since = ""
-			resp, err = s.matrixClient.Sync(ctx, userID, since, filterAfterEventID)
+			resp, err = s.matrixClient.Sync(ctx, userID)
 		}
 	}
 	if err != nil {
@@ -163,7 +149,7 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 
 	received, sent := make([]models.SMS, 0, 8), make([]models.SMS, 0, 8)
 
-	// Resolve the caller's identifier (e.g. "91201")
+	// Resolve the caller's identifier (e.g. "91201" -> "201")
 	callerIdentifier := s.resolveMatrixIDToIdentifier(string(userID))
 
 	for _, room := range resp.Rooms.Join {
@@ -295,7 +281,9 @@ func (s *MessageService) resolveMatrixIDToIdentifier(matrixID string) string {
 
 	// No mapping found, return the original Matrix ID
 	return matrixID
-} // resolveRoomIDToOtherIdentifier finds the identifier of the "other" participant in a room.
+}
+
+// resolveRoomIDToOtherIdentifier finds the identifier of the "other" participant in a room.
 func (s *MessageService) resolveRoomIDToOtherIdentifier(ctx context.Context, roomID id.RoomID, myMatrixID string) string {
 	aliases := s.matrixClient.GetRoomAliases(ctx, roomID)
 	my := strings.TrimSpace(myMatrixID)