Fixes the default name of direct conversations (#114)

The conversation name was missing a "." (dot).
pubnub · Nov 6, 2024 · b706dfa · b706dfa
1 parent ae5063c
commit b706dfa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/ChatImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/ChatImpl.kt
@@ -537,7 +537,7 @@ class ChatImpl(
     ): PNFuture<CreateDirectConversationResult> {
         val user = this.currentUser
         val sortedUsers = listOf(invitedUser.id, user.id).sorted()
-        val finalChannelId = channelId ?: "direct${cyrb53a("${sortedUsers[0]}&${sortedUsers[1]}")}"
+        val finalChannelId = channelId ?: "direct.${cyrb53a("${sortedUsers[0]}&${sortedUsers[1]}")}"
 
         return getChannel(finalChannelId).thenAsync { channel ->
             channel?.asFuture() ?: createChannel(

diff --git a/pubnub-chat-impl/src/commonTest/kotlin/com/pubnub/integration/ChannelIntegrationTest.kt b/pubnub-chat-impl/src/commonTest/kotlin/com/pubnub/integration/ChannelIntegrationTest.kt
@@ -99,16 +99,19 @@ class ChannelIntegrationTest : BaseChatIntegrationTest() {
     @Test
     fun streamPresence() = runTest {
         val completable = CompletableDeferred<Collection<String>>()
-        val closeable = channel01.connect {}
-
-        channel01.streamPresence {
-            if (it.isNotEmpty()) {
-                completable.complete(it)
+        pubnub.test(backgroundScope, checkAllEvents = false) {
+            var closeable: AutoCloseable? = null
+            pubnub.awaitSubscribe(listOf(channel01.id)) {
+                channel01.streamPresence {
+                    if (it.isNotEmpty()) {
+                        completable.complete(it)
+                    }
+                }
+                closeable = channel01.connect {}
             }
+            assertEquals(setOf(someUser.id), completable.await())
+            closeable?.close()
         }
-
-        assertEquals(setOf(someUser.id), completable.await())
-        closeable.close()
     }
 
     @Test

diff --git a/pubnub-chat-impl/src/commonTest/kotlin/com/pubnub/integration/ChatIntegrationTest.kt b/pubnub-chat-impl/src/commonTest/kotlin/com/pubnub/integration/ChatIntegrationTest.kt
@@ -134,7 +134,7 @@ class ChatIntegrationTest : BaseChatIntegrationTest() {
 
         // then
         val sortedUsers = listOf(chat.currentUser.id, someUser.id).sorted()
-        assertEquals("direct${cyrb53a("${sortedUsers[0]}&${sortedUsers[1]}")}", result.channel.id)
+        assertEquals("direct.${cyrb53a("${sortedUsers[0]}&${sortedUsers[1]}")}", result.channel.id)
 
         assertEquals(
             chat.currentUser.asImpl().copy(updated = null, lastActiveTimestamp = null),

diff --git a/pubnub-kotlin b/pubnub-kotlin
+19 −0		pubnub-kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/MembershipsTest.kt
+2 −1		pubnub-kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/PublishTest.kt
+1 −0		pubnub-kotlin/pubnub-kotlin-api/src/jsMain/kotlin/com/pubnub/api/PubNubImpl.kt