Add more decrypted message functions (#196)

* Add batch list for decrypted messages * Add streamAllDecryptedMessages
xmtp · Nov 27, 2023 · 6e81fe1 · 6e81fe1
1 parent 7e1edef
commit 6e81fe1
Show file tree

Hide file tree

Showing 3 changed files with 399 additions and 315 deletions.
diff --git a/Sources/XMTP/Conversation.swift b/Sources/XMTP/Conversation.swift
@@ -118,6 +118,15 @@ public enum Conversation: Sendable {
 		}
 	}
 
+	public func decrypt(_ envelope: Envelope) throws -> DecryptedMessage {
+		switch self {
+		case let .v1(conversationV1):
+			return try conversationV1.decrypt(envelope: envelope)
+		case let .v2(conversationV2):
+			return try conversationV2.decrypt(envelope: envelope)
+		}
+	}
+
 	public func encode<Codec: ContentCodec, T>(codec: Codec, content: T) async throws -> Data where Codec.T == T {
 		switch self {
 		case let .v1:

diff --git a/Sources/XMTP/ConversationV2.swift b/Sources/XMTP/ConversationV2.swift
@@ -137,11 +137,15 @@ public struct ConversationV2 {
 		let envelopes = try await client.apiClient.envelopes(topic: topic.description, pagination: pagination)
 
 		return try envelopes.map { envelope in
-			let message = try Message(serializedData: envelope.message)
-			return try MessageV2.decrypt(generateID(from: envelope), topic, message.v2, keyMaterial: keyMaterial, client: client)
+			try decrypt(envelope: envelope)
 		}
 	}
 
+	func decrypt(envelope: Envelope) throws -> DecryptedMessage {
+		let message = try Message(serializedData: envelope.message)
+		return try MessageV2.decrypt(generateID(from: envelope), topic, message.v2, keyMaterial: keyMaterial, client: client)
+	}
+
 	var ephemeralTopic: String {
 		topic.replacingOccurrences(of: "/xmtp/0/m", with: "/xmtp/0/mE")
 	}