From 90abdea73db675971f5af01cf10e654af913b994 Mon Sep 17 00:00:00 2001 From: jguz-pubnub Date: Mon, 26 Aug 2024 17:10:26 +0200 Subject: [PATCH 1/3] Fix for invalid casting --- .../com/pubnub/chat/internal/message/ThreadMessageImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt index 299eb5bc..5a5b655a 100644 --- a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt +++ b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt @@ -85,7 +85,7 @@ data class ThreadMessageImpl( channelId = channelId, userId = messageItem.uuid!!, actions = messageItem.actions, - meta = messageItem.meta?.decode()?.let { it as Map? }, + meta = messageItem.meta?.decode()?.let { it as? Map? }, mentionedUsers = messageItem.meta.extractMentionedUsers(), referencedChannels = messageItem.meta.extractReferencedChannels(), quotedMessage = messageItem.meta?.let { PNDataEncoder.decode(it) }, From afc3a8b1085c32541741c09809e86589be54802c Mon Sep 17 00:00:00 2001 From: jguz-pubnub Date: Mon, 26 Aug 2024 18:33:39 +0200 Subject: [PATCH 2/3] Fix for extracting quotedMessage --- .../internal/message/ThreadMessageImpl.kt | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt index 5a5b655a..e5c8528b 100644 --- a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt +++ b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt @@ -11,7 +11,6 @@ import com.pubnub.chat.internal.ChatInternal import com.pubnub.chat.internal.channel.ChannelImpl import com.pubnub.chat.internal.defaultGetMessageResponseBody import com.pubnub.chat.internal.error.PubNubErrorMessage.PARENT_CHANNEL_DOES_NOT_EXISTS -import com.pubnub.chat.internal.serialization.PNDataEncoder import com.pubnub.chat.internal.util.pnError import com.pubnub.chat.types.EventContent import com.pubnub.chat.types.MessageMentionedUsers @@ -35,17 +34,17 @@ data class ThreadMessageImpl( override val referencedChannels: MessageReferencedChannels? = null, override val quotedMessage: QuotedMessage? = null, ) : BaseMessage( - chat = chat, - timetoken = timetoken, - content = content, - channelId = channelId, - userId = userId, - actions = actions, - meta = meta, - mentionedUsers = mentionedUsers, - referencedChannels = referencedChannels, - quotedMessage = quotedMessage - ), + chat = chat, + timetoken = timetoken, + content = content, + channelId = channelId, + userId = userId, + actions = actions, + meta = meta, + mentionedUsers = mentionedUsers, + referencedChannels = referencedChannels, + quotedMessage = quotedMessage +), ThreadMessage { override fun copyWithActions(actions: Actions): ThreadMessage = copy(actions = actions) @@ -67,7 +66,7 @@ data class ThreadMessageImpl( meta = pnMessageResult.userMetadata?.decode() as? Map, mentionedUsers = pnMessageResult.userMetadata.extractMentionedUsers(), referencedChannels = pnMessageResult.userMetadata.extractReferencedChannels(), - quotedMessage = pnMessageResult.userMetadata?.let { PNDataEncoder.decode(it) }, + quotedMessage = pnMessageResult.userMetadata?.extractQuotedMessage(), ) } @@ -88,7 +87,7 @@ data class ThreadMessageImpl( meta = messageItem.meta?.decode()?.let { it as? Map? }, mentionedUsers = messageItem.meta.extractMentionedUsers(), referencedChannels = messageItem.meta.extractReferencedChannels(), - quotedMessage = messageItem.meta?.let { PNDataEncoder.decode(it) }, + quotedMessage = messageItem.meta?.extractQuotedMessage(), ) } } From cebc93c9007e895b7f627e2c08035addab8714ca Mon Sep 17 00:00:00 2001 From: jguz-pubnub Date: Tue, 27 Aug 2024 10:30:14 +0200 Subject: [PATCH 3/3] Fixed linter issues --- .../internal/message/ThreadMessageImpl.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt index e5c8528b..7c7a799c 100644 --- a/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt +++ b/pubnub-chat-impl/src/commonMain/kotlin/com/pubnub/chat/internal/message/ThreadMessageImpl.kt @@ -34,17 +34,17 @@ data class ThreadMessageImpl( override val referencedChannels: MessageReferencedChannels? = null, override val quotedMessage: QuotedMessage? = null, ) : BaseMessage( - chat = chat, - timetoken = timetoken, - content = content, - channelId = channelId, - userId = userId, - actions = actions, - meta = meta, - mentionedUsers = mentionedUsers, - referencedChannels = referencedChannels, - quotedMessage = quotedMessage -), + chat = chat, + timetoken = timetoken, + content = content, + channelId = channelId, + userId = userId, + actions = actions, + meta = meta, + mentionedUsers = mentionedUsers, + referencedChannels = referencedChannels, + quotedMessage = quotedMessage + ), ThreadMessage { override fun copyWithActions(actions: Actions): ThreadMessage = copy(actions = actions)