From 43c83f7cb36fbc804d7c7268c0485957ef472132 Mon Sep 17 00:00:00 2001
From: Nick Wright <nwright970@gmail.com>
Date: Mon, 21 Oct 2024 22:01:33 +0000
Subject: [PATCH] Fix thread order by preserving message order

---
 pkg/connector/backfill.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go
index 45a034d..b8bf32e 100644
--- a/pkg/connector/backfill.go
+++ b/pkg/connector/backfill.go
@@ -106,7 +106,12 @@ func (s *SlackClient) FetchMessages(ctx context.Context, params bridgev2.FetchMe
 			maxMsgID = msg.Timestamp
 		}
 	}
-	slices.Reverse(convertedMessages)
+
+	// Reverse converted messages order for non-thread messages.
+	if params.ThreadRoot == "" {
+		slices.Reverse(convertedMessages)
+	}
+
 	lastRead := s.getLastReadCache(channelID)
 	return &bridgev2.FetchMessagesResponse{
 		Messages: convertedMessages,