Changes after review.

pubnub · Jan 3, 2025 · 2bcaf27 · 2bcaf27
1 parent 943b2cd
commit 2bcaf27
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/MembershipImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/MembershipImpl.kt
@@ -57,13 +57,13 @@ data class MembershipImpl(
                 channels = listOf(PNChannelMembership.Partial(channel.id, custom)),
                 include = MembershipInclude(
                     includeCustom = true,
-                    includeStatus = false,
-                    includeType = false,
+                    includeStatus = true,
+                    includeType = true,
                     includeTotalCount = true,
                     includeChannel = true,
                     includeChannelCustom = true,
                     includeChannelType = true,
-                    includeChannelStatus = false
+                    includeChannelStatus = true
                 ),
                 filter = filterThisChannel()
             ).then { pnChannelMembershipArrayResult ->
@@ -116,11 +116,11 @@ data class MembershipImpl(
             chat,
             channel,
             user,
-            update.custom?.value ?: custom,
+            update.custom.let { newCustom -> if (newCustom != null) newCustom.value else custom },
             update.updated,
             update.eTag,
-            update.status?.value,
-            update.type?.value
+            update.status.let { newStatus -> if (newStatus != null) newStatus.value else status },
+            update.type.let { newType -> if (newType != null) newType.value else type }
         )
     }
 

diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/UserImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/UserImpl.kt
@@ -105,13 +105,13 @@ data class UserImpl(
             sort = sort,
             include = MembershipInclude(
                 includeCustom = true,
-                includeStatus = false,
-                includeType = false,
+                includeStatus = true,
+                includeType = true,
                 includeTotalCount = true,
                 includeChannel = true,
                 includeChannelCustom = true,
                 includeChannelType = true,
-                includeChannelStatus = false
+                includeChannelStatus = true
             )
         ).then { pnChannelMembershipArrayResult ->
             MembershipsResponse(
@@ -209,13 +209,13 @@ data class UserImpl(
             sort = sort,
             include = MembershipInclude(
                 includeCustom = true,
-                includeStatus = false,
-                includeType = false,
+                includeStatus = true,
+                includeType = true,
                 includeTotalCount = true,
                 includeChannel = true,
                 includeChannelCustom = true,
                 includeChannelType = true,
-                includeChannelStatus = false
+                includeChannelStatus = true
             )
         )
     }