diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt index a8b1dc61f14..8cdf7a30440 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt @@ -22,7 +22,6 @@ import io.getstream.chat.android.ReadReceipts import io.getstream.chat.android.TypingIndicators import io.getstream.chat.android.client.api2.model.dto.AttachmentDto import io.getstream.chat.android.client.api2.model.dto.ChannelInfoDto -import io.getstream.chat.android.client.api2.model.dto.DeliveryReceiptsDto import io.getstream.chat.android.client.api2.model.dto.DeviceDto import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelUserRead @@ -43,10 +42,7 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadInfoDto import io.getstream.chat.android.client.api2.model.dto.DownstreamUserDto import io.getstream.chat.android.client.api2.model.dto.DownstreamUserGroupDto import io.getstream.chat.android.client.api2.model.dto.DownstreamUserGroupMemberDto -import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto -import io.getstream.chat.android.client.api2.model.dto.ReadReceiptsDto import io.getstream.chat.android.client.api2.model.dto.SearchWarningDto -import io.getstream.chat.android.client.api2.model.dto.TypingIndicatorsDto import io.getstream.chat.android.client.api2.model.response.MessageResponse import io.getstream.chat.android.client.api2.model.response.QueryRemindersResponse import io.getstream.chat.android.client.extensions.enrichWithCid @@ -1000,34 +996,6 @@ internal class DomainMapping( platformCircumvented = platformCircumvented ?: false, ) - /** - * Transforms [PrivacySettingsDto] to [PrivacySettings]. - */ - internal fun PrivacySettingsDto.toDomain(): PrivacySettings = PrivacySettings( - typingIndicators = typing_indicators?.toDomain(), - deliveryReceipts = delivery_receipts?.toDomain(), - readReceipts = read_receipts?.toDomain(), - ) - - /** - * Transforms [TypingIndicatorsDto] to [TypingIndicators]. - */ - internal fun TypingIndicatorsDto.toDomain(): TypingIndicators = TypingIndicators( - enabled = enabled, - ) - - /** - * Transforms [DeliveryReceiptsDto] to [DeliveryReceipts]. - */ - internal fun DeliveryReceiptsDto.toDomain() = DeliveryReceipts(enabled = enabled) - - /** - * Transforms [ReadReceiptsDto] to [ReadReceipts]. - */ - internal fun ReadReceiptsDto.toDomain(): ReadReceipts = ReadReceipts( - enabled = enabled, - ) - /** * Transforms [PrivacySettingsResponse] to [PrivacySettings]. */ diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt index bc52f777029..c5e86ab1981 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt @@ -16,16 +16,9 @@ package io.getstream.chat.android.client.api2.mapping -import io.getstream.chat.android.DeliveryReceipts import io.getstream.chat.android.PrivacySettings -import io.getstream.chat.android.ReadReceipts -import io.getstream.chat.android.TypingIndicators import io.getstream.chat.android.client.api2.model.dto.AttachmentDto -import io.getstream.chat.android.client.api2.model.dto.DeliveryReceiptsDto import io.getstream.chat.android.client.api2.model.dto.DeviceDto -import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto -import io.getstream.chat.android.client.api2.model.dto.ReadReceiptsDto -import io.getstream.chat.android.client.api2.model.dto.TypingIndicatorsDto import io.getstream.chat.android.client.api2.model.dto.UpstreamConnectedEventDto import io.getstream.chat.android.client.api2.model.dto.UpstreamLocationDto import io.getstream.chat.android.client.api2.model.dto.UpstreamMemberDataDto @@ -237,33 +230,13 @@ internal class DtoMapping( ) /** - * Maps the domain [PrivacySettings] model to a network [PrivacySettingsDto] model. + * Maps the domain [PrivacySettings] model to the network model, which the spec shares between the + * request and the response. */ - internal fun PrivacySettings.toDto(): PrivacySettingsDto = PrivacySettingsDto( - typing_indicators = typingIndicators?.toDto(), - read_receipts = readReceipts?.toDto(), - delivery_receipts = deliveryReceipts?.toDto(), - ) - - /** - * Maps the domain [TypingIndicators] model to a network [TypingIndicatorsDto] model. - */ - internal fun TypingIndicators.toDto(): TypingIndicatorsDto = TypingIndicatorsDto( - enabled = enabled, - ) - - /** - * Maps the domain [ReadReceipts] model to a network [ReadReceiptsDto] model. - */ - internal fun ReadReceipts.toDto(): ReadReceiptsDto = ReadReceiptsDto( - enabled = enabled, - ) - - /** - * Maps the domain [DeliveryReceipts] model to a network [DeliveryReceiptsDto] model. - */ - internal fun DeliveryReceipts.toDto(): DeliveryReceiptsDto = DeliveryReceiptsDto( - enabled = enabled, + internal fun PrivacySettings.toDto(): PrivacySettingsResponse = PrivacySettingsResponse( + typingIndicators = typingIndicators?.let { TypingIndicatorsResponse(enabled = it.enabled) }, + readReceipts = readReceipts?.let { ReadReceiptsResponse(enabled = it.enabled) }, + deliveryReceipts = deliveryReceipts?.let { DeliveryReceiptsResponse(enabled = it.enabled) }, ) /** @@ -306,17 +279,11 @@ internal class DtoMapping( image = image, invisible = isInvisible, language = language, - privacySettings = privacySettings?.toResponse(), + privacySettings = privacySettings?.toDto(), custom = extraData, ) } - private fun PrivacySettings.toResponse(): PrivacySettingsResponse = PrivacySettingsResponse( - typingIndicators = typingIndicators?.let { TypingIndicatorsResponse(enabled = it.enabled) }, - readReceipts = readReceipts?.let { ReadReceiptsResponse(enabled = it.enabled) }, - deliveryReceipts = deliveryReceipts?.let { DeliveryReceiptsResponse(enabled = it.enabled) }, - ) - /** * Maps the domain [ConnectedEvent] model to a network [UpstreamConnectedEventDto] model. */ diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PrivacySettings.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PrivacySettings.kt deleted file mode 100644 index f925fec7eec..00000000000 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PrivacySettings.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved. - * - * Licensed under the Stream License; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.getstream.chat.android.client.api2.model.dto - -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -internal data class PrivacySettingsDto( - val typing_indicators: TypingIndicatorsDto? = null, - val delivery_receipts: DeliveryReceiptsDto? = null, - val read_receipts: ReadReceiptsDto? = null, -) - -@JsonClass(generateAdapter = true) -internal data class TypingIndicatorsDto( - val enabled: Boolean, -) - -@JsonClass(generateAdapter = true) -internal data class DeliveryReceiptsDto( - val enabled: Boolean, -) - -@JsonClass(generateAdapter = true) -internal data class ReadReceiptsDto( - val enabled: Boolean, -) diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt index fe4cd8a351f..11ad85dd4ef 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt @@ -18,6 +18,7 @@ package io.getstream.chat.android.client.api2.model.dto import com.squareup.moshi.JsonClass import io.getstream.chat.android.core.internal.StreamHandsOff +import io.getstream.chat.android.network.models.PrivacySettingsResponse import io.getstream.chat.android.network.models.UserMuteResponse import java.util.Date import io.getstream.chat.android.network.models.ChannelMute as ChannelMuteResponse @@ -37,7 +38,7 @@ internal data class UpstreamUserDto( val name: String, val image: String, val invisible: Boolean, - val privacy_settings: PrivacySettingsDto?, + val privacy_settings: PrivacySettingsResponse?, val language: String, val role: String, val devices: List, @@ -62,7 +63,7 @@ internal data class DownstreamUserDto( val image: String?, val role: String, val invisible: Boolean? = null, - val privacy_settings: PrivacySettingsDto?, + val privacy_settings: PrivacySettingsResponse?, val language: String?, val banned: Boolean, val devices: List?, diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt index c338dd495c4..9926e94a9bc 100644 --- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt +++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt @@ -46,10 +46,7 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamUserGroupDto import io.getstream.chat.android.client.api2.model.dto.DownstreamUserGroupMemberDto import io.getstream.chat.android.client.api2.model.dto.ErrorDetailDto import io.getstream.chat.android.client.api2.model.dto.ErrorDto -import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto -import io.getstream.chat.android.client.api2.model.dto.ReadReceiptsDto import io.getstream.chat.android.client.api2.model.dto.SearchWarningDto -import io.getstream.chat.android.client.api2.model.dto.TypingIndicatorsDto import io.getstream.chat.android.client.api2.model.response.DraftMessageResponse import io.getstream.chat.android.client.api2.model.response.QueryDraftMessagesResponse import io.getstream.chat.android.client.api2.model.response.QueryRemindersResponse @@ -98,6 +95,7 @@ import io.getstream.chat.android.network.models.PollOptionResponseData import io.getstream.chat.android.network.models.PollResponseData import io.getstream.chat.android.network.models.PollVoteResponseData import io.getstream.chat.android.network.models.PollVotesResponse +import io.getstream.chat.android.network.models.PrivacySettingsResponse import io.getstream.chat.android.network.models.QueryPollsResponse import io.getstream.chat.android.network.models.ReactionGroupResponse import io.getstream.chat.android.network.models.ReactionResponse @@ -388,7 +386,7 @@ internal object Mother { image: String? = randomString(), role: String = randomString(), invisible: Boolean? = null, - privacy_settings: PrivacySettingsDto? = null, + privacy_settings: PrivacySettingsResponse? = null, language: String? = randomString(), banned: Boolean = randomBoolean(), devices: List? = emptyList(), @@ -929,20 +927,6 @@ internal object Mother { platformCircumvented = platformCircumvented, ) - fun randomPrivacySettingsDto( - typingIndicators: TypingIndicatorsDto = randomTypingIndicatorsDto(), - readReceipts: ReadReceiptsDto = randomReadReceiptsDto(), - ): PrivacySettingsDto = PrivacySettingsDto( - typing_indicators = typingIndicators, - read_receipts = readReceipts, - ) - - fun randomTypingIndicatorsDto(enabled: Boolean = randomBoolean()): TypingIndicatorsDto = - TypingIndicatorsDto(enabled) - - fun randomReadReceiptsDto(enabled: Boolean = randomBoolean()): ReadReceiptsDto = - ReadReceiptsDto(enabled) - fun randomQueryUsersRequest( filter: FilterObject = Filters.neutral(), offset: Int = randomInt(), diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt index b9f23f67c17..3842e8683eb 100644 --- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt +++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt @@ -17,7 +17,6 @@ package io.getstream.chat.android.client.api2.mapping import io.getstream.chat.android.PrivacySettings -import io.getstream.chat.android.ReadReceipts import io.getstream.chat.android.TypingIndicators import io.getstream.chat.android.client.Mother import io.getstream.chat.android.client.Mother.randomAppResponseFields @@ -53,7 +52,6 @@ import io.getstream.chat.android.client.Mother.randomPollOptionResponseData import io.getstream.chat.android.client.Mother.randomPollResponseData import io.getstream.chat.android.client.Mother.randomPollVoteResponseData import io.getstream.chat.android.client.Mother.randomPollVotesResponse -import io.getstream.chat.android.client.Mother.randomPrivacySettingsDto import io.getstream.chat.android.client.Mother.randomQueryPollsResponse import io.getstream.chat.android.client.Mother.randomQueryRemindersResponse import io.getstream.chat.android.client.Mother.randomReactionGroupResponse @@ -1288,18 +1286,6 @@ internal class DomainMappingTest { assertEquals(expected, moderation) } - @Test - fun `PrivacySettingsDto is correctly mapped to PrivacySettings`() { - val privacySettingsDto = randomPrivacySettingsDto() - val sut = Fixture().get() - val privacySettings = with(sut) { privacySettingsDto.toDomain() } - val expected = PrivacySettings( - typingIndicators = TypingIndicators(enabled = privacySettingsDto.typing_indicators?.enabled == true), - readReceipts = ReadReceipts(enabled = privacySettingsDto.read_receipts?.enabled == true), - ) - assertEquals(expected, privacySettings) - } - @Test fun `SearchWarningDto is correctly mapped to SearchWarning`() { val searchWarningDto = randomSearchWarningDto() diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt index f0f7486f8fa..a15aad7f305 100644 --- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt +++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt @@ -21,11 +21,7 @@ import io.getstream.chat.android.PrivacySettings import io.getstream.chat.android.ReadReceipts import io.getstream.chat.android.TypingIndicators import io.getstream.chat.android.client.api2.model.dto.AttachmentDto -import io.getstream.chat.android.client.api2.model.dto.DeliveryReceiptsDto import io.getstream.chat.android.client.api2.model.dto.DeviceDto -import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto -import io.getstream.chat.android.client.api2.model.dto.ReadReceiptsDto -import io.getstream.chat.android.client.api2.model.dto.TypingIndicatorsDto import io.getstream.chat.android.client.api2.model.dto.UpstreamConnectedEventDto import io.getstream.chat.android.client.api2.model.dto.UpstreamMemberDataDto import io.getstream.chat.android.client.api2.model.dto.UpstreamUserDto @@ -316,10 +312,10 @@ internal class DtoMappingTest { ) val mapping = Fixture().get() val dto = with(mapping) { privacySettings.toDto() } - val expected = PrivacySettingsDto( - typing_indicators = TypingIndicatorsDto(enabled = true), - read_receipts = ReadReceiptsDto(enabled = false), - delivery_receipts = DeliveryReceiptsDto(enabled = false), + val expected = PrivacySettingsResponse( + typingIndicators = TypingIndicatorsResponse(enabled = true), + readReceipts = ReadReceiptsResponse(enabled = false), + deliveryReceipts = DeliveryReceiptsResponse(enabled = false), ) dto shouldBeEqualTo expected } @@ -333,10 +329,10 @@ internal class DtoMappingTest { ) val mapping = Fixture().get() val dto = with(mapping) { privacySettings.toDto() } - val expected = PrivacySettingsDto( - typing_indicators = TypingIndicatorsDto(enabled = true), - read_receipts = ReadReceiptsDto(enabled = false), - delivery_receipts = null, + val expected = PrivacySettingsResponse( + typingIndicators = TypingIndicatorsResponse(enabled = true), + readReceipts = ReadReceiptsResponse(enabled = false), + deliveryReceipts = null, ) dto shouldBeEqualTo expected } diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/PrivacySettingsParsingTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/PrivacySettingsParsingTest.kt index 70ee1a4dc58..b344c891168 100644 --- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/PrivacySettingsParsingTest.kt +++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/PrivacySettingsParsingTest.kt @@ -18,12 +18,12 @@ package io.getstream.chat.android.client.parser2 import com.squareup.moshi.JsonDataException import io.getstream.chat.android.client.api2.mapping.DomainMapping -import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto import io.getstream.chat.android.client.parser2.direct.PrivacySettingsAdapter import io.getstream.chat.android.client.parser2.testdata.PrivacySettingsTestData import io.getstream.chat.android.models.NoOpChannelTransformer import io.getstream.chat.android.models.NoOpMessageTransformer import io.getstream.chat.android.models.NoOpUserTransformer +import io.getstream.chat.android.network.models.PrivacySettingsResponse import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows @@ -41,18 +41,18 @@ internal class PrivacySettingsParsingTest { private val privacySettingsAdapter = PrivacySettingsAdapter() - // region DTO path (JSON → PrivacySettingsDto → PrivacySettings) + // region Response path (JSON → PrivacySettingsResponse → PrivacySettings) @Test - fun `DTO path - deserializes all fields`() { - val dto = parser.fromJson(PrivacySettingsTestData.jsonAllFields, PrivacySettingsDto::class.java) + fun `Response path - deserializes all fields`() { + val dto = parser.fromJson(PrivacySettingsTestData.jsonAllFields, PrivacySettingsResponse::class.java) val privacySettings = with(domainMapping) { dto.toDomain() } assertEquals(PrivacySettingsTestData.expectedAllFields, privacySettings) } @Test - fun `DTO path - deserializes with optional fields missing`() { - val dto = parser.fromJson(PrivacySettingsTestData.jsonOptionalFieldsMissing, PrivacySettingsDto::class.java) + fun `Response path - deserializes with optional fields missing`() { + val dto = parser.fromJson(PrivacySettingsTestData.jsonOptionalFieldsMissing, PrivacySettingsResponse::class.java) val privacySettings = with(domainMapping) { dto.toDomain() } assertEquals(PrivacySettingsTestData.expectedOptionalFieldsMissing, privacySettings) } @@ -80,7 +80,7 @@ internal class PrivacySettingsParsingTest { @Test fun `Both paths - same error on typing_indicators missing enabled`() { val dtoException = assertThrows { - parser.fromJson(PrivacySettingsTestData.jsonTypingIndicatorsMissingEnabled, PrivacySettingsDto::class.java) + parser.fromJson(PrivacySettingsTestData.jsonTypingIndicatorsMissingEnabled, PrivacySettingsResponse::class.java) } val directException = assertThrows { privacySettingsAdapter.fromJson(PrivacySettingsTestData.jsonTypingIndicatorsMissingEnabled) @@ -91,7 +91,7 @@ internal class PrivacySettingsParsingTest { @Test fun `Both paths - same error on delivery_receipts missing enabled`() { val dtoException = assertThrows { - parser.fromJson(PrivacySettingsTestData.jsonDeliveryReceiptsMissingEnabled, PrivacySettingsDto::class.java) + parser.fromJson(PrivacySettingsTestData.jsonDeliveryReceiptsMissingEnabled, PrivacySettingsResponse::class.java) } val directException = assertThrows { privacySettingsAdapter.fromJson(PrivacySettingsTestData.jsonDeliveryReceiptsMissingEnabled) @@ -102,7 +102,7 @@ internal class PrivacySettingsParsingTest { @Test fun `Both paths - same error on read_receipts missing enabled`() { val dtoException = assertThrows { - parser.fromJson(PrivacySettingsTestData.jsonReadReceiptsMissingEnabled, PrivacySettingsDto::class.java) + parser.fromJson(PrivacySettingsTestData.jsonReadReceiptsMissingEnabled, PrivacySettingsResponse::class.java) } val directException = assertThrows { privacySettingsAdapter.fromJson(PrivacySettingsTestData.jsonReadReceiptsMissingEnabled) diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/UserDtoTestData.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/UserDtoTestData.kt index 4bed5cb68c2..b29d6a7a09b 100644 --- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/UserDtoTestData.kt +++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/UserDtoTestData.kt @@ -16,15 +16,15 @@ package io.getstream.chat.android.client.parser2.testdata -import io.getstream.chat.android.client.api2.model.dto.DeliveryReceiptsDto import io.getstream.chat.android.client.api2.model.dto.DeviceDto import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto import io.getstream.chat.android.client.api2.model.dto.DownstreamUserDto -import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto -import io.getstream.chat.android.client.api2.model.dto.ReadReceiptsDto -import io.getstream.chat.android.client.api2.model.dto.TypingIndicatorsDto import io.getstream.chat.android.client.api2.model.dto.UpstreamUserDto import io.getstream.chat.android.network.models.ChatPreferencesResponse +import io.getstream.chat.android.network.models.DeliveryReceiptsResponse +import io.getstream.chat.android.network.models.PrivacySettingsResponse +import io.getstream.chat.android.network.models.ReadReceiptsResponse +import io.getstream.chat.android.network.models.TypingIndicatorsResponse import io.getstream.chat.android.network.models.UserMuteResponse import io.getstream.chat.android.network.models.UserResponse import org.intellij.lang.annotations.Language @@ -237,14 +237,14 @@ internal object UserDtoTestData { name = "username", image = "image", invisible = false, - privacy_settings = PrivacySettingsDto( - typing_indicators = TypingIndicatorsDto( + privacy_settings = PrivacySettingsResponse( + typingIndicators = TypingIndicatorsResponse( enabled = false, ), - read_receipts = ReadReceiptsDto( + readReceipts = ReadReceiptsResponse( enabled = false, ), - delivery_receipts = DeliveryReceiptsDto( + deliveryReceipts = DeliveryReceiptsResponse( enabled = false, ), ), @@ -367,14 +367,14 @@ internal object UserDtoTestData { id = "userId", role = "owner", invisible = false, - privacy_settings = PrivacySettingsDto( - typing_indicators = TypingIndicatorsDto( + privacy_settings = PrivacySettingsResponse( + typingIndicators = TypingIndicatorsResponse( enabled = false, ), - read_receipts = ReadReceiptsDto( + readReceipts = ReadReceiptsResponse( enabled = false, ), - delivery_receipts = DeliveryReceiptsDto( + deliveryReceipts = DeliveryReceiptsResponse( enabled = false, ), ),