Messages with reactions function, dm fix #596
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| { | ||
| "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json", | ||
| "changelog": [ | ||
| "@changesets/changelog-git", | ||
| { | ||
| "repo": "xmtp/xmtp-react-native" | ||
| } | ||
| ], | ||
| "commit": false, | ||
| "fixed": [], | ||
| "linked": [], | ||
| "access": "public", | ||
| "baseBranch": "main", | ||
| "updateInternalDependencies": "patch", | ||
| "ignore": [] | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ import org.xmtp.android.library.codecs.ContentTypeAttachment | |
| import org.xmtp.android.library.codecs.ContentTypeGroupUpdated | ||
| import org.xmtp.android.library.codecs.ContentTypeId | ||
| import org.xmtp.android.library.codecs.ContentTypeReaction | ||
| import org.xmtp.android.library.codecs.ContentTypeReactionV2 | ||
| import org.xmtp.android.library.codecs.ContentTypeReadReceipt | ||
| import org.xmtp.android.library.codecs.ContentTypeRemoteAttachment | ||
| import org.xmtp.android.library.codecs.ContentTypeReply | ||
|
|
@@ -21,6 +22,7 @@ import org.xmtp.android.library.codecs.GroupUpdated | |
| import org.xmtp.android.library.codecs.GroupUpdatedCodec | ||
| import org.xmtp.android.library.codecs.Reaction | ||
| import org.xmtp.android.library.codecs.ReactionCodec | ||
| import org.xmtp.android.library.codecs.ReactionV2Codec | ||
| import org.xmtp.android.library.codecs.ReadReceipt | ||
| import org.xmtp.android.library.codecs.ReadReceiptCodec | ||
| import org.xmtp.android.library.codecs.RemoteAttachment | ||
|
|
@@ -33,6 +35,10 @@ import org.xmtp.android.library.codecs.description | |
| import org.xmtp.android.library.codecs.getReactionAction | ||
| import org.xmtp.android.library.codecs.getReactionSchema | ||
| import org.xmtp.android.library.codecs.id | ||
| import uniffi.xmtpv3.FfiReaction | ||
| import uniffi.xmtpv3.FfiReactionAction | ||
| import uniffi.xmtpv3.FfiReactionSchema | ||
| import uniffi.xmtpv3.decodeReaction | ||
| import java.net.URL | ||
|
|
||
| class ContentJson( | ||
|
|
@@ -55,6 +61,7 @@ class ContentJson( | |
| Client.register(ReplyCodec()) | ||
| Client.register(ReadReceiptCodec()) | ||
| Client.register(GroupUpdatedCodec()) | ||
| Client.register(ReactionV2Codec()) | ||
| } | ||
|
|
||
| fun fromJsonObject(obj: JsonObject): ContentJson { | ||
|
|
@@ -95,6 +102,18 @@ class ContentJson( | |
| content = reaction.get("content").asString, | ||
| ) | ||
| ) | ||
| } else if (obj.has("reactionV2")) { | ||
| val reaction = obj.get("reactionV2").asJsonObject | ||
| return ContentJson( | ||
| ContentTypeReactionV2, FfiReaction( | ||
| reference = reaction.get("reference").asString, | ||
| action = getReactionV2Action(reaction.get("action").asString.lowercase()), | ||
| schema = getReactionV2Schema(reaction.get("schema").asString.lowercase()), | ||
| content = reaction.get("content").asString, | ||
| // Update if we add referenceInboxId to ../src/lib/types/ContentCodec.ts#L19-L24 | ||
| referenceInboxId = "" | ||
|
There was a problem hiding this comment. Question: is that intentional left empty? There was a problem hiding this comment. yea that property is sort of stubbed in for now, as I noticed it was included in the xmtp-js reaction type: https://github.com/xmtp/xmtp-js/blob/80aa5ec4fb24b60def222537cebcb20c818ca993/content-types/content-type-reaction/src/Reaction.ts#L24 However xmtp-react-native has an existing ReactionContent type that didn't feel worth updating at this point since I'm not sure what definitely a code smell though, I added a clarifying comments here 👌: faad8de |
||
| ) | ||
| ) | ||
| } else if (obj.has("reply")) { | ||
| val reply = obj.get("reply").asJsonObject | ||
| val nested = fromJsonObject(reply.get("content").asJsonObject) | ||
|
|
@@ -159,6 +178,18 @@ class ContentJson( | |
| ) | ||
| ) | ||
|
|
||
| ContentTypeReactionV2.id -> { | ||
| val reaction: FfiReaction = decodeReaction(encodedContent!!.toByteArray()) | ||
|
There was a problem hiding this comment. reactionV2 in this PR mainly serves to show how proto based ContentTypes that are used in libxmtp and upstream xmtp-android/ios can be utilized in React Native. In this PR, we're basically converting the proto type back to json before utilizing the Reaction content in RN typescript code. An alternative would be to send the reaction content as bytes over the RN bridge and deserialize the bytes to the Reaction proto object in typescript. This pattern would generally lead to less data going over the RN bridge and would probably be a net gain for pretty much all data classes we use. However, it probably makes sense to start implementing that pattern in a separate PR. Lastly, in a follow up, we can delete the reactionV2Codec in RN, and simply update the ContentTypeId version from 1.0 to 2.0, and the underlying SDK will switch from using JSON serializing to proto serializing without RN integrators knowing the difference. One exception is that old clients will not be able to deserialize messages sent with the proto backed reactions, but they should recognize that the version has been updated, and display the fallback instead. maintaining the two different Reaction and ReactionV2 for a short while in RN will help us test those paths. |
||
| mapOf( | ||
| "reaction" to mapOf( | ||
| "reference" to reaction.reference, | ||
| "action" to getReactionV2ActionString(reaction.action), | ||
| "schema" to getReactionV2SchemaString(reaction.schema), | ||
| "content" to reaction.content, | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| ContentTypeReply.id -> mapOf( | ||
| "reply" to mapOf( | ||
| "reference" to (content as Reply).reference, | ||
|
|
@@ -227,4 +258,38 @@ class ContentJson( | |
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun getReactionV2Schema(schema: String): FfiReactionSchema { | ||
| return when (schema) { | ||
| "unicode" -> FfiReactionSchema.UNICODE | ||
| "shortcode" -> FfiReactionSchema.SHORTCODE | ||
| "custom" -> FfiReactionSchema.CUSTOM | ||
| else -> FfiReactionSchema.UNKNOWN | ||
| } | ||
| } | ||
|
|
||
| fun getReactionV2Action(action: String): FfiReactionAction { | ||
| return when (action) { | ||
| "removed" -> FfiReactionAction.REMOVED | ||
| "added" -> FfiReactionAction.ADDED | ||
| else -> FfiReactionAction.UNKNOWN | ||
| } | ||
| } | ||
|
|
||
| fun getReactionV2SchemaString(schema: FfiReactionSchema): String { | ||
| return when (schema) { | ||
| FfiReactionSchema.UNICODE -> "unicode" | ||
| FfiReactionSchema.SHORTCODE -> "shortcode" | ||
| FfiReactionSchema.CUSTOM -> "custom" | ||
| FfiReactionSchema.UNKNOWN -> "unknown" | ||
| } | ||
| } | ||
|
|
||
| fun getReactionV2ActionString(action: FfiReactionAction): String { | ||
| return when (action) { | ||
| FfiReactionAction.REMOVED -> "removed" | ||
| FfiReactionAction.ADDED -> "added" | ||
| FfiReactionAction.UNKNOWN -> "unknown" | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the documentation isnt super clear on this, but hoping this will fix our changesets not creating github release / tag.