Add direction to pagination (#155)

* fix: add direction to the pagination of messages

* add a test for it

* get the test passing

Sources/XMTP/ApiClient.swift

@@ -47,11 +47,11 @@ func makeQueryRequest(topic: String, pagination: Pagination? = nil, cursor: Curs
         }
         if let endAt = pagination?.before {
             $0.endTimeNs = UInt64(endAt.millisecondsSinceEpoch) * 1_000_000
-            $0.pagingInfo.direction = .descending
+            $0.pagingInfo.direction = pagination?.direction ?? .descending
         }
         if let startAt = pagination?.after {
             $0.startTimeNs = UInt64(startAt.millisecondsSinceEpoch) * 1_000_000
-            $0.pagingInfo.direction = .descending
+            $0.pagingInfo.direction = pagination?.direction ?? .descending
         }
         if let cursor {
             $0.pagingInfo.cursor = cursor

Sources/XMTP/Conversation.swift

@@ -199,12 +199,12 @@ public enum Conversation: Sendable {
 	}
 
 	/// List messages in the conversation
-	public func messages(limit: Int? = nil, before: Date? = nil, after: Date? = nil) async throws -> [DecodedMessage] {
+    public func messages(limit: Int? = nil, before: Date? = nil, after: Date? = nil, direction: PagingInfoSortDirection? = .descending) async throws -> [DecodedMessage] {
 		switch self {
 		case let .v1(conversationV1):
-			return try await conversationV1.messages(limit: limit, before: before, after: after)
+            return try await conversationV1.messages(limit: limit, before: before, after: after, direction: direction)
 		case let .v2(conversationV2):
-			return try await conversationV2.messages(limit: limit, before: before, after: after)
+			return try await conversationV2.messages(limit: limit, before: before, after: after, direction: direction)
 		}
 	}
 

Sources/XMTP/ConversationV1.swift

@@ -177,8 +177,8 @@ public struct ConversationV1 {
 		}
 	}
 
-	func messages(limit: Int? = nil, before: Date? = nil, after: Date? = nil) async throws -> [DecodedMessage] {
-		let pagination = Pagination(limit: limit, before: before, after: after)
+	func messages(limit: Int? = nil, before: Date? = nil, after: Date? = nil, direction: PagingInfoSortDirection? = .descending) async throws -> [DecodedMessage] {
+		let pagination = Pagination(limit: limit, before: before, after: after, direction: direction)
 
 		let envelopes = try await client.apiClient.envelopes(
             topic: Topic.directMessageV1(client.address, peerAddress).description,

Sources/XMTP/ConversationV2.swift

@@ -118,8 +118,8 @@ public struct ConversationV2 {
 		return try await prepareMessage(encodedContent: encoded, options: options)
 	}
 
-	func messages(limit: Int? = nil, before: Date? = nil, after: Date? = nil) async throws -> [DecodedMessage] {
-		let pagination = Pagination(limit: limit, before: before, after: after)
+    func messages(limit: Int? = nil, before: Date? = nil, after: Date? = nil, direction: PagingInfoSortDirection? = .descending) async throws -> [DecodedMessage] {
+        let pagination = Pagination(limit: limit, before: before, after: after, direction: direction)
 		let envelopes = try await client.apiClient.envelopes(topic: topic.description, pagination: pagination)
 
 		return envelopes.compactMap { envelope in

Sources/XMTP/Messages/PagingInfo.swift

@@ -9,18 +9,19 @@ import Foundation
 
 typealias PagingInfo = Xmtp_MessageApi_V1_PagingInfo
 typealias PagingInfoCursor = Xmtp_MessageApi_V1_Cursor
-typealias PagingInfoSortDirection = Xmtp_MessageApi_V1_SortDirection
+public typealias PagingInfoSortDirection = Xmtp_MessageApi_V1_SortDirection
 
 public struct Pagination {
 	public var limit: Int?
     public var before: Date?
     public var after: Date?
-    var direction: PagingInfoSortDirection?
+    public var direction: PagingInfoSortDirection?
 
-    public init(limit: Int? = nil, before: Date? = nil, after: Date? = nil) {
+    public init(limit: Int? = nil, before: Date? = nil, after: Date? = nil, direction: PagingInfoSortDirection? = .descending) {
         self.limit = limit
         self.before = before
         self.after = after
+        self.direction = direction
     }
 
 	var pagingInfo: PagingInfo {

Sources/XMTPTestHelpers/TestHelpers.swift

@@ -197,6 +197,15 @@ public class FakeApiClient: ApiClient {
 				}
 			}
 		}
+
+        if let direction = pagination?.direction {
+            switch direction {
+            case .ascending:
+                result = Array(result.reversed())
+            default:
+                break
+            }
+        }
 
 		var queryResponse = QueryResponse()
 		queryResponse.envelopes = result

Tests/XMTPTests/IntegrationTests.swift

@@ -414,6 +414,12 @@ final class IntegrationTests: XCTestCase {
 		XCTAssertEqual(1, messages3.count)
 		let nowMessage2 = messages3[0]
 		XCTAssertEqual("now", nowMessage2.body)
+
+        let messagesAsc = try await convo.messages(direction: .ascending)
+        XCTAssertEqual("10 seconds ago", messagesAsc[0].body)
+
+        let messagesDesc = try await convo.messages(direction: .descending)
+        XCTAssertEqual("now", messagesDesc[0].body)
 	}
 
     func testStreamingMessagesShouldBeReceived() async throws {

XMTP.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "XMTP"
-  spec.version      = "0.5.3-alpha0"
+  spec.version      = "0.5.4-alpha0"
   spec.summary      = "XMTP SDK Cocoapod"
 
   # This description is used to generate tags and improve search results.