update all the places with group updated

xmtp · May 29, 2024 · 491e985 · 491e985
1 parent f6a17f4
commit 491e985
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 54 deletions.
diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ContentJson.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ContentJson.kt
@@ -176,7 +176,7 @@ class ContentJson(
             )
 
             ContentTypeGroupUpdated.id -> mapOf(
-                "groupChange" to mapOf(
+                "groupUpdated" to mapOf(
                     "membersAdded" to (content as GroupUpdated).addedInboxesList.map {
                         mapOf(
                             "inboxId" to it.inboxId,

diff --git a/example/src/GroupScreen.tsx b/example/src/GroupScreen.tsx
@@ -31,7 +31,7 @@ import {
   StaticAttachmentContent,
   ReplyContent,
   useClient,
-  GroupChangeContent,
+  GroupUpdatedContent,
 } from 'xmtp-react-native-sdk'
 import { ConversationSendPayload } from 'xmtp-react-native-sdk/lib/types'
 
@@ -1074,42 +1074,42 @@ function formatAddress(address: string) {
   return `${address.slice(0, 6)}…${address.slice(-4)}`
 }
 
-function GroupChangeContents({ content }: { content: GroupChangeContent }) {
+function GroupUpdatedContents({ content }: { content: GroupUpdatedContent }) {
   return (
     <>
       {content.membersAdded.length > 0 &&
         (content.membersAdded.length === 1 ? (
           <Text style={{ opacity: 0.5, fontStyle: 'italic' }}>
             {`${formatAddress(
-              content.membersAdded[0].address
+              content.membersAdded[0].inboxId
             )} has been added by ${formatAddress(
-              content.membersAdded[0].initiatedByAddress
+              content.membersAdded[0].initiatedByInboxId
             )}`}
           </Text>
         ) : (
           <Text style={{ opacity: 0.5, fontStyle: 'italic' }}>
             {`${
               content.membersAdded.length
             } members have been added by ${formatAddress(
-              content.membersAdded[0].initiatedByAddress
+              content.membersAdded[0].initiatedByInboxId
             )}`}
           </Text>
         ))}
       {content.membersRemoved.length > 0 &&
         (content.membersRemoved.length === 1 ? (
           <Text style={{ opacity: 0.5, fontStyle: 'italic' }}>
             {`${formatAddress(
-              content.membersRemoved[0].address
+              content.membersRemoved[0].inboxId
             )} has been removed by ${formatAddress(
-              content.membersRemoved[0].initiatedByAddress
+              content.membersRemoved[0].initiatedByInboxId
             )}`}
           </Text>
         ) : (
           <Text style={{ opacity: 0.5, fontStyle: 'italic', flexWrap: 'wrap' }}>
             {`${
               content.membersRemoved.length
             } members have been removed by ${formatAddress(
-              content.membersRemoved[0].initiatedByAddress
+              content.membersRemoved[0].initiatedByInboxId
             )}`}
           </Text>
         ))}
@@ -1172,7 +1172,7 @@ function MessageContents({
     )
   }
   if (contentTypeId === 'xmtp.org/group_membership_change:1.0') {
-    return <GroupChangeContents content={content} />
+    return <GroupUpdatedContents content={content} />
   }
 
   return (

diff --git a/example/src/contentTypes/contentTypes.ts b/example/src/contentTypes/contentTypes.ts
@@ -1,5 +1,5 @@
 import {
-  GroupChangeCodec,
+  GroupUpdatedCodec,
   ReactionCodec,
   ReplyCodec,
   RemoteAttachmentCodec,
@@ -11,7 +11,7 @@ export const supportedCodecs = [
   new ReplyCodec(),
   new RemoteAttachmentCodec(),
   new StaticAttachmentCodec(),
-  new GroupChangeCodec(),
+  new GroupUpdatedCodec(),
 ]
 
 export type SupportedContentTypes = typeof supportedCodecs
diff --git a/ios/Wrappers/DecodedMessageWrapper.swift b/ios/Wrappers/DecodedMessageWrapper.swift
@@ -163,15 +163,15 @@ struct ContentJson {
 		case ContentTypeReadReceipt.id where content is XMTP.ReadReceipt:
 			return ["readReceipt": ""]
 		case ContentTypeGroupUpdated.id where content is XMTP.GroupUpdated:
-			let groupChange = content as! XMTP.GroupUpdated
-			return ["groupChange": [
-				"membersAdded": groupChange.addedInboxes.map { member in
+			let groupUpdated = content as! XMTP.GroupUpdated
+			return ["groupUpdated": [
+				"membersAdded": groupUpdated.addedInboxes.map { member in
 					[
 						"inboxId": member.inboxID,
 						"initiatedByInboxId": member.initiatedByInboxID
 					]
 				},
-				"membersRemoved": groupChange.removedInboxes.map { member in
+				"membersRemoved": groupUpdated.removedInboxes.map { member in
 					[
 						"inboxId": member.inboxID,
 						"initiatedByInboxId": member.initiatedByInboxID

diff --git a/src/index.ts b/src/index.ts
@@ -25,7 +25,7 @@ import { getAddress } from './utils/address'
 
 export * from './context'
 export * from './hooks'
-export { GroupChangeCodec } from './lib/NativeCodecs/GroupChangeCodec'
+export { GroupUpdatedCodec } from './lib/NativeCodecs/GroupUpdatedCodec'
 export { ReactionCodec } from './lib/NativeCodecs/ReactionCodec'
 export { ReadReceiptCodec } from './lib/NativeCodecs/ReadReceiptCodec'
 export { RemoteAttachmentCodec } from './lib/NativeCodecs/RemoteAttachmentCodec'

diff --git a/src/lib/NativeCodecs/GroupChangeCodec.ts b/src/lib/NativeCodecs/GroupChangeCodec.ts
diff --git a/src/lib/types/ContentCodec.ts b/src/lib/types/ContentCodec.ts
@@ -53,14 +53,14 @@ export type RemoteAttachmentContent = RemoteAttachmentMetadata & {
   url: string
 }
 
-export type GroupChangeEntry = {
-  address: string
-  initiatedByAddress: string
+export type GroupUpdatedEntry = {
+  inboxId: string
+  initiatedByInboxId: string
 }
 
-export type GroupChangeContent = {
-  membersAdded: GroupChangeEntry[]
-  membersRemoved: GroupChangeEntry[]
+export type GroupUpdatedContent = {
+  membersAdded: GroupUpdatedEntry[]
+  membersRemoved: GroupUpdatedEntry[]
 }
 
 // This contains a message that has been prepared for sending.
@@ -101,7 +101,7 @@ export type NativeMessageContent = {
   remoteAttachment?: RemoteAttachmentContent
   readReceipt?: ReadReceiptContent
   encoded?: string
-  groupChange?: GroupChangeContent
+  groupUpdated?: GroupUpdatedContent
 }
 
 export interface JSContentCodec<T> {