feat: integrate shouldPush for React Native (#231)

* update Package.resolved * feat: add shouldPush property to DecryptedMessage struct * feat: add shouldPush property to SendOptions struct * feat: add shouldPush parameter to MessageV2.encode() method * feat: add shouldPush option to ConversationV2 initialization * fix: update SendOptions initializer parameter name * Fix Sample App WalletConnect.configure Signature --------- Co-authored-by: Ethan Mateja <[email protected]>
xmtp · Feb 20, 2024 · bb9e024 · bb9e024
1 parent c0eacb2
commit bb9e024
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/xmtp/libxmtp-swift",
       "state" : {
-        "branch" : "92274fe",
-        "revision" : "92274fe0dde1fc7f8f716ebcffa3d252813be56d"
+        "revision" : "db13df1fef0e4a11880a889640a3df2998e4abac",
+        "version" : "0.4.2-beta1"
       }
     },
     {

diff --git a/Sources/XMTPiOS/ConversationV2.swift b/Sources/XMTPiOS/ConversationV2.swift
@@ -85,7 +85,8 @@ public struct ConversationV2 {
 			content: encodedContent,
 			topic: topic,
 			keyMaterial: keyMaterial,
-			codec: codec
+			codec: codec,
+			shouldPush: options?.shouldPush
 		)
 
 		let topic = options?.ephemeral == true ? ephemeralTopic : topic

diff --git a/Sources/XMTPiOS/Messages/DecryptedMessage.swift b/Sources/XMTPiOS/Messages/DecryptedMessage.swift
@@ -13,4 +13,5 @@ public struct DecryptedMessage {
 	public var senderAddress: String
 	public var sentAt: Date
 	public var topic: String = ""
+	public var shouldPush: Bool?
 }
diff --git a/Sources/XMTPiOS/Messages/MessageV2.swift b/Sources/XMTPiOS/Messages/MessageV2.swift
@@ -58,7 +58,8 @@ extension MessageV2 {
 			encodedContent: encodedMessage,
 			senderAddress: try signed.sender.walletAddress,
 			sentAt: Date(timeIntervalSince1970: Double(header.createdNs / 1_000_000) / 1000),
-			topic: topic
+			topic: topic,
+			shouldPush: message.shouldPush
 		)
 	}
 
@@ -80,7 +81,7 @@ extension MessageV2 {
 		}
 	}
 
-	static func encode<Codec: ContentCodec>(client: Client, content encodedContent: EncodedContent, topic: String, keyMaterial: Data, codec: Codec) async throws -> MessageV2 {
+	static func encode<Codec: ContentCodec>(client: Client, content encodedContent: EncodedContent, topic: String, keyMaterial: Data, codec: Codec, shouldPush: Bool? = nil) async throws -> MessageV2 {
 		let payload = try encodedContent.serializedData()
 
 		let date = Date()
@@ -107,14 +108,13 @@ extension MessageV2 {
 		let senderHmac = try Crypto.generateHmacSignature(secret: keyMaterial, info: infoEncoded, message: headerBytes)
 
 		let decoded = try codec.decode(content: encodedContent, client: client)
-		let shouldPush = try codec.shouldPush(content: decoded)
-
+		let calculatedShouldPush = try codec.shouldPush(content: decoded)
 
 		return MessageV2(
 			headerBytes: headerBytes,
 			ciphertext: ciphertext,
 			senderHmac: senderHmac,
-			shouldPush: shouldPush
+			shouldPush: shouldPush ?? calculatedShouldPush
 		)
 	}
 }
diff --git a/Sources/XMTPiOS/SendOptions.swift b/Sources/XMTPiOS/SendOptions.swift
@@ -11,10 +11,12 @@ public struct SendOptions {
 	public var compression: EncodedContentCompression?
 	public var contentType: ContentTypeID?
 	public var ephemeral: Bool = false
+	public var shouldPush: Bool?
 
-	public init(compression: EncodedContentCompression? = nil, contentType: ContentTypeID? = nil, ephemeral: Bool = false) {
+	public init(compression: EncodedContentCompression? = nil, contentType: ContentTypeID? = nil, ephemeral: Bool = false, __shouldPush: Bool? = nil) {
 		self.compression = compression
 		self.contentType = contentType
 		self.ephemeral = ephemeral
+		self.shouldPush = __shouldPush
 	}
 }
diff --git a/XMTPiOSExample/XMTPiOSExample/Views/LoginView.swift b/XMTPiOSExample/XMTPiOSExample/Views/LoginView.swift
@@ -128,7 +128,11 @@ struct LoginView: View {
 				name: "XMTP Chat",
 				description: "It's a chat app.",
 				url: "https://localhost:4567",
-				icons: []
+                icons: [],
+                redirect: AppMetadata.Redirect(
+                    native: "",
+                    universal: nil
+                )
 			)
 		)