get all dm tests passing on both platforms

android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt

@@ -539,9 +539,9 @@ class XMTPModule : Module() {
             }
         }
 
-        AsyncFunction("sendMessageToConversation") Coroutine { inboxId: String, id: String, contentJson: String ->
+        AsyncFunction("sendMessage") Coroutine { inboxId: String, id: String, contentJson: String ->
             withContext(Dispatchers.IO) {
-                logV("sendMessageToConversation")
+                logV("sendMessage")
                 val client = clients[inboxId] ?: throw XMTPException("No client")
                 val conversation = client.findConversation(id)
                     ?: throw XMTPException("no conversation found for $id")
@@ -1151,10 +1151,10 @@ class XMTPModule : Module() {
             subscribeToAllMessages(inboxId = inboxId, getStreamType(type))
         }
 
-        AsyncFunction("subscribeToConversationMessages") Coroutine { inboxId: String, id: String ->
+        AsyncFunction("subscribeToMessages") Coroutine { inboxId: String, id: String ->
             withContext(Dispatchers.IO) {
-                logV("subscribeToConversationMessages")
-                subscribeToConversationMessages(
+                logV("subscribeToMessages")
+                subscribeToMessages(
                     inboxId = inboxId,
                     id = id
                 )
@@ -1171,10 +1171,10 @@ class XMTPModule : Module() {
             subscriptions[getConversationsKey(inboxId)]?.cancel()
         }
 
-        AsyncFunction("unsubscribeFromConversationMessages") Coroutine { inboxId: String, id: String ->
+        AsyncFunction("unsubscribeFromMessages") Coroutine { inboxId: String, id: String ->
             withContext(Dispatchers.IO) {
-                logV("unsubscribeFromConversationMessages")
-                unsubscribeFromConversationMessages(
+                logV("unsubscribeFromMessages")
+                unsubscribeFromMessages(
                     inboxId = inboxId,
                     id = id
                 )
@@ -1284,7 +1284,7 @@ class XMTPModule : Module() {
         }
     }
 
-    private suspend fun subscribeToConversationMessages(inboxId: String, id: String) {
+    private suspend fun subscribeToMessages(inboxId: String, id: String) {
         val client = clients[inboxId] ?: throw XMTPException("No client")
         val conversation = client.findConversation(id)
             ?: throw XMTPException("no conversation found for $id")
@@ -1317,7 +1317,7 @@ class XMTPModule : Module() {
         return "conversations:$inboxId"
     }
 
-    private fun unsubscribeFromConversationMessages(
+    private fun unsubscribeFromMessages(
         inboxId: String,
         id: String,
     ) {

example/src/tests/dmTests.ts

@@ -1,9 +1,5 @@
 import { Test, assert, createClients, delayToPropogate } from './test-utils'
-import {
-  Conversation,
-  ConversationId,
-  ConversationVersion,
-} from '../../../src/index'
+import { Conversation } from '../../../src/index'
 
 export const dmTests: Test[] = []
 let counter = 1
@@ -28,28 +24,27 @@ test('can list dms with params', async () => {
   await boDm2.send({ text: `third message` })
   await boGroup2.send({ text: `first message` })
   await boDm1.send({ text: `dm message` })
-  // Order should be [Dm1, Group2, Dm2, Group1]
 
   await boClient.conversations.syncAllConversations()
   const boConvosOrderCreated = await boClient.conversations.listDms()
   const boConvosOrderLastMessage = await boClient.conversations.listDms(
     { lastMessage: true },
     'lastMessage'
   )
-  const boGroupsLimit = await boClient.conversations.listDms({}, undefined, 1)
+  const boDmsLimit = await boClient.conversations.listDms({}, undefined, 1)
 
   assert(
     boConvosOrderCreated
       .map((conversation: any) => conversation.id)
       .toString() === [boDm1.id, boDm2.id].toString(),
-    `Conversation created at order should be ${[boDm1.id, boDm2.id].toString()} but was ${boConvosOrderCreated.map((group: any) => group.id).toString()}`
+    `Conversation created at order should be ${[boDm1.id, boDm2.id].toString()} but was ${boConvosOrderCreated.map((convo: any) => convo.id).toString()}`
   )
 
   assert(
     boConvosOrderLastMessage
       .map((conversation: any) => conversation.id)
       .toString() === [boDm1.id, boDm2.id].toString(),
-    `Conversation last message order should be ${[boDm1.id, boDm2.id].toString()} but was ${boConvosOrderLastMessage.map((group: any) => group.id).toString()}`
+    `Conversation last message order should be ${[boDm1.id, boDm2.id].toString()} but was ${boConvosOrderLastMessage.map((convo: any) => convo.id).toString()}`
   )
 
   const messages = await boConvosOrderLastMessage[0].messages()
@@ -58,6 +53,11 @@ test('can list dms with params', async () => {
     `last message 1 should be dm message ${messages[0].content()}`
   )
 
+  assert(
+    boDmsLimit[0].id === boDm1.id,
+    `Dms limit should be ${boDm1.id} but was ${boDmsLimit[0].id}`
+  )
+
   return true
 })
 
@@ -68,7 +68,7 @@ test('can stream all dm messages', async () => {
   let messageCallbacks = 0
   await bo.conversations.stream(async () => {
     conversationCallbacks++
-  })
+  }, 'dms')
 
   await bo.conversations.streamAllMessages(async () => {
     messageCallbacks++
@@ -82,12 +82,12 @@ test('can stream all dm messages', async () => {
   await delayToPropogate()
 
   assert(
-    conversationCallbacks === 2,
-    'conversation stream should have received 2 conversation'
+    conversationCallbacks === 1,
+    'conversation stream should have received 1 conversation'
   )
   assert(
-    messageCallbacks === 2,
-    'message stream should have received 2 message'
+    messageCallbacks === 1,
+    'message stream should have received 1 message'
   )
 
   return true

ios/XMTPModule.swift

@@ -1659,7 +1659,7 @@ public class XMTPModule: Module {
 						.streamAllMessages(type: type)
 					{
 						try sendEvent(
-							"messages",
+							"message",
 							[
 								"inboxId": inboxId,
 								"message": DecodedMessageWrapper.encodeToObj(

src/index.ts

@@ -348,17 +348,13 @@ export async function prepareMessage(
   return await XMTPModule.prepareMessage(inboxId, conversationId, contentJson)
 }
 
-export async function sendMessageToConversation(
+export async function sendMessage(
   inboxId: InboxId,
   conversationId: ConversationId,
   content: any
 ): Promise<MessageId> {
   const contentJson = JSON.stringify(content)
-  return await XMTPModule.sendMessageToConversation(
-    inboxId,
-    conversationId,
-    contentJson
-  )
+  return await XMTPModule.sendMessage(inboxId, conversationId, contentJson)
 }
 
 export async function publishPreparedMessages(

src/lib/Dm.ts

@@ -71,11 +71,7 @@ export class Dm<ContentTypes extends DefaultContentTypes = DefaultContentTypes>
         content = { text: content }
       }
 
-      return await XMTP.sendMessageToConversation(
-        this.client.inboxId,
-        this.id,
-        content
-      )
+      return await XMTP.sendMessage(this.client.inboxId, this.id, content)
     } catch (e) {
       console.info('ERROR in send()', e.message)
       throw e
@@ -179,7 +175,6 @@ export class Dm<ContentTypes extends DefaultContentTypes = DefaultContentTypes>
         message: DecodedMessage<ContentTypes>
         conversationId: string
       }) => {
-        // Long term these checks should be able to be done on the native layer as well, but additional checks in JS for safety
         if (inboxId !== this.client.inboxId) {
           return
         }

src/lib/Group.ts

@@ -98,7 +98,7 @@ export class Group<
         content = { text: content }
       }
 
-      return await XMTP.sendMessageToConversation(
+      return await XMTP.sendMessage(
         this.client.inboxId,
         this.id,
         content