Introduce message delivery receipts (#5979)

* Add ChatClient.markMessagesAsDelivered function to mark messages as delivered

* Add delivery receipts support to user privacy settings

* Introduce a initial DeliveryReceiptsManager to handle message delivery receipts

* Introduce MessageReceiptDao and MessageReceiptEntity for handling message receipts

* Introduce MessageReceipt model and repository for handling message delivery receipts

* Make MessageReceiptRepository `getAllByType` return a Flow and add a `clear` function

The `MessageReceiptRepository.getAllByType` function now accepts a `limit` parameter and returns a `Flow<List<MessageReceipt>>` instead of a `suspend` function returning `List<MessageReceipt>`.

A new `clear()` function has been added to `MessageReceiptRepository` to delete all receipts from the database.

* Refactor DeliveryReceiptsManager to store receipts locally

The `DeliveryReceiptsManager` has been renamed to `MessageReceiptManager`.

Instead of making a direct API call to mark messages as delivered, the manager now creates `MessageReceipt` objects and upserts them into the local `MessageReceiptRepository`. This change also refactors the corresponding tests to verify the local database interaction rather than the API call.

* Introduced `MessageReceiptReporter`, a new class responsible for observing the local database for delivery receipts and reporting them to the backend.

This reporter collects receipts in batches and sends them periodically to reduce network traffic. After a successful API call, the reported receipts are removed from the local database. New tests are included to verify this functionality.

* Prapare to move internal persistence to the client module

* Add ChatClientDatabase, DateConverter, and ChatClientRepository for message receipt management

* Refactor: Move message receipt logic to client

Moves the `MessageReceiptRepository` and related classes from the `stream-chat-android-offline` module to the `stream-chat-android-client` module. This refactoring centralizes persistence logic within the client module.

The moved classes have been renamed and their package structure updated. Method names within the repository have been made more specific (e.g., `upsert` is now `upsertMessageReceipts`). The `MessageReceiptRepository` is now an internal interface with a companion object factory.

* Support `message.delivered` event

This commit adds support for the `message.delivered` event, which is triggered when a message is marked as delivered.

The following changes are included:
- A new `MessageDeliveredEvent` data class.
- New fields (`last_delivered_at`, `last_delivered_message_id`) to the `ChannelUserRead` DTO and model.
- Logic to parse and map the `message.delivered` event from the backend DTO to the domain model.

* Refactor: Add default empty implementations for `QueryChannelsListener` interface instead

* Deprecate `hasUnread` in favor of `currentUserUnreadCount`

* Add `userRead` and `deliveredReads` helper functions

Extracted the logic for retrieving a user's read state into a new `Channel.userRead()` helper function. This simplifies the implementation of `countUnreadMentionsForUser` and `currentUserUnreadCount`.

Additionally, introduced `Channel.deliveredReads(message)` to get a list of users who have received a specific message.

* Introduce `markChannelsAsDelivered`, a new function to mark the last message in a list of channels as delivered. It contains logic to identify the appropriate message to mark as delivered, considering factors like whether the message is already read or delivered.

* Refactor MessageReceiptReporter to use a polling mechanism

Replaced the Flow-based implementation in `MessageReceiptReporter` with a `while(isActive)` loop and a `delay`. This change simplifies the logic for polling and reporting message delivery receipts.

The `getAllMessageReceiptsByType` function in `MessageReceiptRepository` and `MessageReceiptDao` is now a `suspend` function instead of returning a `Flow`.

The corresponding tests have been updated to reflect these changes.

* Moves the user ID update in the `switchUser` function to after the user is disconnected. This ensures that coroutines related to the previous user are properly cancelled before the new user connects.

* Rename MessageReceiptReporter.init to start and add logging

* Refactor MessageReceiptManagerTest to standardize verification methods for upsertMessageReceipts calls

* Automatically mark messages as delivered when querying channels

Introduced a `MessageDeliveredPlugin` that automatically marks messages as delivered upon a successful `queryChannels` call. This plugin is enabled by default.

* Introduce `ChatClientRepository` to encapsulate internal repositories used by `ChatClient`. This new repository is now a required dependency for `ChatClient`.

* Add MessageReceiptManager and MessageReceiptReporter to ChatClient

* Decoupled `MessageReceiptReporter` from `ChatClient` by passing `ChatApi` directly to its constructor. This simplifies dependencies and removes the need for `ChatClient` as an intermediary for API calls.

Updated tests to reflect this change, mocking `ChatApi` instead of `ChatClient`.

* Refactor ChatClientTest to simplify test setup

- Remove unused properties and simplify the `setUp` method.
- Make test properties `private`.
- Remove `runTest` from test function signatures as it's already handled by the `TestCoroutineExtension`.

* Rename deliveredReads to deliveredReadsOf

* feat: Add delivered status indicator for messages

This commit introduces a new "delivered" status for messages, which is displayed when a message has been delivered but not yet read.

**Key changes:**

-   Added `isMessageDelivered` property to `MessageItemState` and `MessageListItem`.
-   Introduced a new grey double-check icon (`stream_ui_ic_check_double_grey`) for the delivered state.
-   Updated `ChannelListViewStyle` and `MessageListItemStyle` to include `indicatorDeliveredIcon`.
-   The message status indicator logic in both UI Components and Compose has been updated to show the delivered icon between the "sent" and "read" states.
-   Added a new `stream_ui_message_list_semantics_message_status_delivered` string for accessibility.
-   In Compose, `MessageFooterStatusIndicator` is updated to accept `MessageFooterStatusIndicatorParams` to handle the new delivered state, deprecating the old signature.

* Fix flaky test

* Add more tests

* Feat: Add `Channel.readsOf()` extension function

Adds a `readsOf(message: Message)` extension function to the `Channel` class. This function returns a list of `ChannelUserRead` objects for users who have read the given message, excluding the message sender.

Also includes:
- Adding corresponding unit tests for the new function.
- Renaming `ChannelExtensionsTests.kt` to `ChannelExtensionTest.kt`.
- Migrating existing tests from `kluent` to `JUnit Jupiter` assertions.

* Add pending status indicator snapshot test

* Add unit test for MessageReceiptRepository instantiation

* Fix the message status indicator paddings

* Mark messages as delivered on push notification

* sonar lint

* Mark channel as delivered on query a single channel

* Provide a ChatClient lazily in ChatNotifications

* Hide the message status indicator when a message is deleted

* Do not expose ChatClient.markMessagesAsDelivered

* feat: Add delivery_events flag to Config

Added a `deliveryEventsEnabled` flag to the `Config` model. This allows disabling message delivery events on a per-channel basis. Delivery receipts will not be stored or sent if this flag is disabled in the channel configuration.

* Refactor: Improve message delivery receipts logic

This commit refactors the `MessageReceiptManager` to enhance the logic for marking messages as delivered.

Key changes include:
- Renaming `markMessagesAsDelivered(messages: List<Message>)` to `markMessageAsDelivered(message: Message)` and making it the public API. The old function is now private and handles batch processing.
- Before marking a message as delivered, the manager now fetches the corresponding channel from the local repository or the API to ensure all conditions are met.
- The responsibility of filtering messages that can be marked as delivered is moved into a new private function `canMarkMessageAsDelivered`.
- Test cases have been updated to reflect these changes and improve coverage.

* Add DELIVERY_EVENTS to ChannelCapabilities

* Refactor: Make MessageReceiptManager functions suspend

The `MessageReceiptManager` is refactored to use `suspend` functions instead of launching new coroutines from a provided `CoroutineScope`. This simplifies the class by removing the need for an injected scope and improves testability.

Key changes:
- `markChannelsAsDelivered` and `markMessageAsDelivered` are now `suspend` functions.
- The `CoroutineScope` dependency has been removed from `MessageReceiptManager` and its initialization in `ChatClient`.
- `MessageDeliveredPlugin` is updated to use `onSuccessSuspend` to call the new suspend functions.
- `ChatNotificationsImpl` now launches a coroutine to call the suspend function `markMessageAsDelivered`.
- Tests are updated to use `verifyBlocking` for testing suspend functions and to provide the necessary `CoroutineScope` where required.

* Refactor: Lazy initialize messageReceiptManager in MessageDeliveredPlugin and ChatClient

* Fix: Fetch message from API when marking as delivered by ID

When `markMessageAsDelivered` is called with a `messageId`, the SDK now fetches the message from the local repository. If the message is not found locally, it falls back to fetching it from the API.

This ensures that a delivery receipt can be sent for a push notification even if the message is not yet in the local database.

* Skip sending delivery receipts for shadowed messages and muted users

This change prevents sending message delivery receipts for messages that are either shadowed or sent by a user who has been muted by the current user.

* Add deliveryEventsEnabled to channel configuration and mapping

* Add message info option to message menu

* Extra PaneTitle and PaneRow components for reusing

* Add message info component to display read and delivered status

* Stop using kluent assertions

* Update read and delivered status checks to include equal comparison

* Add user profile privacy settings screen

* Add privacy settings mapping to domain model

* Fix message info component to display read and delivered timestamps correctly

* typo

* CHANGELOG

* Change userRead function visibility to internal

* Use getCreatedAtOrDefault

* Remove MessageReceipt's 'type' field

* Move MessageReceiptRepositoryImpl to the same file as MessageReceiptRepository

* Fix tests after rebased from develop

* Update User.mergePartially to conditionally merge based on update timestamps

* Store UserMuteEntity properly

* Refactor event handling to consolidate user updates

* Refactor `MessageReceiptManager` to fetch the current user from the repository

* Refactor: Lazily inject RepositoryFacade into MessageReceiptManager

* Expose `markMessageAsDelivered` and allow custom handling of incoming push messages before they are processed by the SDK.

* Enhance UserRepositoryTests: Add tests for user insertion and selection with privacy settings and mutes

* improve test coverage

* Rename `onNewPushMessage` to `onNewMessage` to keep consistency between SDKs

* Stop using kluent

* Refactor markMessageAsDelivered methods to return Boolean indicating success or failure

* Check for the `MESSAGE_NEW` event type before marking a message as delivered.

* Add unit tests for MessagingStyleNotificationHandler

* Remove timestamps of the read and delivered members since the timestamp is always related to the latest message in the channel, and not for each message individually.

* kdoc

* Check for the `MESSAGE_NEW` event type before marking a message as delivered.

* Add unit tests for NotificationHandlerFactory

---------

Co-authored-by: Petar Velikov <[email protected]>

Author: andremion

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### ⬆️ Improved
 
 ### ✅ Added
+- Introduce message delivery receipts. [#5979](https://github.com/GetStream/stream-chat-android/pull/5979)
 
 ### ⚠️ Changed
 
@@ -17,8 +18,12 @@
 - Use `ExoPlayer` instead of `MediaPlayer` for audio message playback. [#5980](https://github.com/GetStream/stream-chat-android/pull/5980)
 
 ### ✅ Added
+- Introduce `Channel.userRead` extension function to get the read status of a specific user in the channel. [#5979](https://github.com/GetStream/stream-chat-android/pull/5979)
+- Introduce `Channel.readsOf` extension function to get the read statuses representing which users have read the given message in the channel. [#5979](https://github.com/GetStream/stream-chat-android/pull/5979)
+- Introduce `ChatClient.markMessageAsDelivered` to mark a message as delivered for the current user. [#5979](https://github.com/GetStream/stream-chat-android/pull/5979)
 
 ### ⚠️ Changed
+- Deprecate `Channel.hasUnread` property in favor of `Channel.currentUserUnreadCount`. [#5979](https://github.com/GetStream/stream-chat-android/pull/5979)
 
 ### ❌ Removed
 
@@ -3613,7 +3618,7 @@ The following items are breaking changes, since it was very important to improve
 - Added `ChatUI.channelNameFormatter` to allow customizing the channel's name format. [#3068](https://github.com/GetStream/stream-chat-android/pull/3068)
 - Added a customizable height attribute to SearchInputView [#3081](https://github.com/GetStream/stream-chat-android/pull/3081)
 - Added `ChatUI.dateFormatter` to allow customizing the way the dates are formatted. [#3085](https://github.com/GetStream/stream-chat-android/pull/3085)
-- Added ways to show/hide the delivery status indicators for channels and messages. [#3102](https://github.com/GetStream/stream-chat-android/pull/3102)
+- Added ways to show/hide the delivery receipts indicators for channels and messages. [#3102](https://github.com/GetStream/stream-chat-android/pull/3102)
 
 ### ⚠️ Changed
 - Disabled editing on Giphy messages given that it's breaking the UX and can override the GIF that was previously put in. [#3071](https://github.com/GetStream/stream-chat-android/pull/3071)

stream-chat-android-client-test/src/main/java/io/getstream/chat/android/client/test/Mother.kt

@@ -27,6 +27,7 @@ import io.getstream.chat.android.client.events.ConnectedEvent
 import io.getstream.chat.android.client.events.MarkAllReadEvent
 import io.getstream.chat.android.client.events.MemberAddedEvent
 import io.getstream.chat.android.client.events.MemberRemovedEvent
+import io.getstream.chat.android.client.events.MessageDeliveredEvent
 import io.getstream.chat.android.client.events.MessageReadEvent
 import io.getstream.chat.android.client.events.MessageUpdatedEvent
 import io.getstream.chat.android.client.events.NewMessageEvent
@@ -260,6 +261,26 @@ public fun randomMessageReadEvent(
     )
 }
 
+public fun randomMessageDeliveredEvent(
+    createdAt: Date = Date(),
+    user: User = randomUser(),
+    cid: String = randomCID(),
+    channelType: String = randomString(),
+    channelId: String = randomString(),
+    lastDeliveredAt: Date = randomDate(),
+    lastDeliveredMessageId: String = randomString(),
+) = MessageDeliveredEvent(
+    type = EventType.MESSAGE_DELIVERED,
+    createdAt = createdAt,
+    rawCreatedAt = streamFormatter.format(createdAt),
+    user = user,
+    cid = cid,
+    channelType = channelType,
+    channelId = channelId,
+    lastDeliveredAt = lastDeliveredAt,
+    lastDeliveredMessageId = lastDeliveredMessageId,
+)
+
 public fun randomNotificationMarkReadEvent(
     createdAt: Date = Date(),
     user: User = randomUser(),

stream-chat-android-client/api/stream-chat-android-client.api

@@ -92,6 +92,10 @@ dependencies {
     implementation(libs.okhttp.logging.interceptor)
     implementation(libs.ok2curl)
 
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.ktx)
+    ksp(libs.androidx.room.compiler)
+
     // Unused dependencies: The following dependencies (appcompat, constraintlayout, livedata-ktx) are not used in the
     // `stream-chat-android-client` module. They are still declared here to prevent potential breaking changes for
     // integrations that might be relying on them transitively. Consider removing them in future major releases.
@@ -106,8 +110,10 @@ dependencies {
     testImplementation(libs.stream.result)
     testImplementation(libs.androidx.test.junit)
     testImplementation(libs.androidx.lifecycle.runtime.testing)
+    testImplementation(libs.androidx.work.testing)
     testImplementation(libs.junit.jupiter.api)
     testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.turbine)
     testRuntimeOnly(libs.junit.jupiter.engine)
     testRuntimeOnly(libs.junit.vintage.engine)
 

stream-chat-android-client/build.gradle.kts

@@ -122,12 +122,17 @@ import io.getstream.chat.android.client.parser2.adapters.internal.StreamDateForm
 import io.getstream.chat.android.client.persistance.repository.RepositoryFacade
 import io.getstream.chat.android.client.persistance.repository.factory.RepositoryFactory
 import io.getstream.chat.android.client.persistance.repository.noop.NoOpRepositoryFactory
+import io.getstream.chat.android.client.persistence.db.ChatClientDatabase
+import io.getstream.chat.android.client.persistence.repository.ChatClientRepository
 import io.getstream.chat.android.client.plugin.DependencyResolver
+import io.getstream.chat.android.client.plugin.MessageDeliveredPluginFactory
 import io.getstream.chat.android.client.plugin.Plugin
 import io.getstream.chat.android.client.plugin.factory.PluginFactory
 import io.getstream.chat.android.client.plugin.factory.ThrottlingPluginFactory
 import io.getstream.chat.android.client.query.AddMembersParams
 import io.getstream.chat.android.client.query.CreateChannelParams
+import io.getstream.chat.android.client.receipts.MessageReceiptManager
+import io.getstream.chat.android.client.receipts.MessageReceiptReporter
 import io.getstream.chat.android.client.scope.ClientScope
 import io.getstream.chat.android.client.scope.UserScope
 import io.getstream.chat.android.client.setup.state.ClientState
@@ -275,6 +280,9 @@ internal constructor(
     @InternalStreamChatApi
     public val audioPlayer: AudioPlayer,
     private val now: () -> Date = ::Date,
+    private val repository: ChatClientRepository,
+    private val messageReceiptReporter: MessageReceiptReporter,
+    internal val messageReceiptManager: MessageReceiptManager,
 ) {
     private val logger by taggedLogger(TAG)
     private val waitConnection = MutableSharedFlow<Result<ConnectionData>>()
@@ -447,13 +455,13 @@ internal constructor(
                 mutableClientState.setUser(user)
             }
 
-            is NewMessageEvent,
-            is NotificationReminderDueEvent,
-            -> {
-                // No other events should potentially show notifications
+            is NewMessageEvent -> {
                 notifications.onChatEvent(event)
+                messageReceiptManager.markMessageAsDelivered(event.message)
             }
 
+            is NotificationReminderDueEvent -> notifications.onChatEvent(event)
+
             is ConnectingEvent -> {
                 logger.i { "[handleEvent] event: ConnectingEvent" }
                 mutableClientState.setConnectionState(ConnectionState.Connecting)
@@ -642,6 +650,7 @@ internal constructor(
         tokenManager.setTokenProvider(tokenProvider)
         appSettingsManager.loadAppSettings()
         warmUp()
+        messageReceiptReporter.start()
         logger.i { "[initializeClientWithUser] user.id: '${user.id}'completed" }
     }
 
@@ -737,9 +746,11 @@ internal constructor(
     ): Call<ConnectionData> {
         return CoroutineCall(clientScope) {
             logger.d { "[switchUser] user.id: '${user.id}'" }
-            userScope.userId.value = user.id
             notifications.deleteDevice() // always delete device if switching users
             disconnectUserSuspend(flushPersistence = true)
+            // change userId only after disconnect,
+            // otherwise the userScope won't cancel coroutines related to the previous user.
+            userScope.userId.value = user.id
             onDisconnectionComplete()
             connectUserSuspend(user, tokenProvider, timeoutMilliseconds).also {
                 logger.v { "[switchUser] completed('${user.id}')" }
@@ -1505,6 +1516,8 @@ internal constructor(
             userCredentialStorage.clear()
         }
 
+        repository.clear()
+
         _repositoryFacade = null
         attachmentsSender.cancelJobs()
         appSettingsManager.clear()
@@ -2869,6 +2882,43 @@ internal constructor(
             }
     }
 
+    /**
+     * Request to mark the message with the given id as delivered if:
+     *
+     * - Delivery receipts are enabled for the current user.
+     * - Delivery events are enabled in the channel config.
+     *
+     * and if all of the following conditions are met for the message:
+     *
+     * - Not sent by the current user.
+     * - Not shadow banned.
+     * - Not sent by a muted user.
+     * - Not yet marked as read by the current user.
+     * - Not yet marked as delivered by the current user.
+     *
+     * IMPORTANT: For this feature to function correctly and efficiently,
+     * the [offline plugin](https://getstream.io/chat/docs/sdk/android/client/guides/offline-support/)
+     * must be enabled to avoid extra API calls to retrieve message and channel data.
+     *
+     * @param messageId The ID of the message to mark as delivered.
+     *
+     * @return Executable async [Call] which completes with [Result] having data equal to true if the message
+     * was marked as delivered, false otherwise.
+     */
+    @CheckResult
+    public fun markMessageAsDelivered(messageId: String): Call<Boolean> =
+        CoroutineCall(userScope) {
+            runCatching { messageReceiptManager.markMessageAsDelivered(messageId) }
+                .fold(
+                    onSuccess = { Result.Success(it) },
+                    onFailure = { Result.Failure(Error.GenericError(it.message.orEmpty())) },
+                )
+        }.doOnStart(userScope) {
+            logger.d { "[markMessageAsDelivered] #doOnStart; messageId: $messageId" }
+        }.doOnResult(userScope) {
+            logger.v { "[markMessageAsDelivered] #doOnResult; completed($messageId)" }
+        }
+
     /**
      * Marks the given message as read.
      *
@@ -4716,7 +4766,8 @@ internal constructor(
                     appVersion = this.appVersion,
                 )
 
-            val appSettingsManager = AppSettingManager(module.api())
+            val api = module.api()
+            val appSettingsManager = AppSettingManager(api)
 
             val audioPlayer: AudioPlayer = StreamAudioPlayer(
                 mediaPlayer = NativeMediaPlayerImpl(appContext) {
@@ -4732,12 +4783,15 @@ internal constructor(
                 userScope = userScope,
             )
 
+            val database = ChatClientDatabase.build(appContext)
+            val repository = ChatClientRepository.from(database)
+
             return ChatClient(
-                config,
-                module.api(),
-                module.dtoMapping,
-                module.notifications(),
-                tokenManager,
+                config = config,
+                api = api,
+                dtoMapping = module.dtoMapping,
+                notifications = module.notifications(),
+                tokenManager = tokenManager,
                 userCredentialStorage = userCredentialStorage ?: SharedPreferencesCredentialStorage(appContext),
                 userStateService = module.userStateService,
                 clientDebugger = clientDebugger ?: StubChatClientDebugger,
@@ -4755,6 +4809,18 @@ internal constructor(
                 mutableClientState = MutableClientState(module.networkStateProvider),
                 currentUserFetcher = module.currentUserFetcher,
                 audioPlayer = audioPlayer,
+                repository = repository,
+                messageReceiptReporter = MessageReceiptReporter(
+                    scope = userScope,
+                    messageReceiptRepository = repository,
+                    api = api,
+                ),
+                messageReceiptManager = MessageReceiptManager(
+                    now = ::Date,
+                    getRepositoryFacade = { instance().repositoryFacade },
+                    messageReceiptRepository = repository,
+                    api = api,
+                ),
             ).apply {
                 attachmentsSender = AttachmentsSender(
                     context = appContext,
@@ -4799,7 +4865,10 @@ internal constructor(
          * @see [Plugin]
          * @see [PluginFactory]
          */
-        protected val pluginFactories: MutableList<PluginFactory> = mutableListOf(ThrottlingPluginFactory)
+        protected val pluginFactories: MutableList<PluginFactory> = mutableListOf(
+            ThrottlingPluginFactory,
+            MessageDeliveredPluginFactory,
+        )
 
         /**
          * Create a [ChatClient] instance based on the current configuration

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt

@@ -338,6 +338,11 @@ internal interface ChatApi {
         messageId: String = "",
     ): Call<Unit>
 
+    @CheckResult
+    fun markDelivered(
+        messages: List<Message>,
+    ): Call<Unit>
+
     @CheckResult
     fun markThreadRead(
         channelType: String,

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/ChatApi.kt

@@ -57,6 +57,7 @@ import io.getstream.chat.android.client.api2.model.requests.FlagUserRequest
 import io.getstream.chat.android.client.api2.model.requests.GuestUserRequest
 import io.getstream.chat.android.client.api2.model.requests.HideChannelRequest
 import io.getstream.chat.android.client.api2.model.requests.InviteMembersRequest
+import io.getstream.chat.android.client.api2.model.requests.MarkDeliveredRequest
 import io.getstream.chat.android.client.api2.model.requests.MarkReadRequest
 import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
 import io.getstream.chat.android.client.api2.model.requests.MuteChannelRequest
@@ -960,6 +961,11 @@ constructor(
         ).toUnitCall()
     }
 
+    override fun markDelivered(messages: List<Message>): Call<Unit> =
+        channelApi.markDelivered(
+            request = MarkDeliveredRequest.create(messages),
+        ).toUnitCall()
+
     override fun markThreadRead(channelType: String, channelId: String, threadId: String): Call<Unit> {
         return channelApi.markRead(
             channelType = channelType,

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt

@@ -23,6 +23,7 @@ import io.getstream.chat.android.client.api2.model.requests.AcceptInviteRequest
 import io.getstream.chat.android.client.api2.model.requests.AddMembersRequest
 import io.getstream.chat.android.client.api2.model.requests.HideChannelRequest
 import io.getstream.chat.android.client.api2.model.requests.InviteMembersRequest
+import io.getstream.chat.android.client.api2.model.requests.MarkDeliveredRequest
 import io.getstream.chat.android.client.api2.model.requests.MarkReadRequest
 import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
 import io.getstream.chat.android.client.api2.model.requests.PinnedMessagesRequest
@@ -211,4 +212,9 @@ internal interface ChannelApi {
         @Path("id") channelId: String,
         @UrlQueryPayload @Query("payload") payload: PinnedMessagesRequest,
     ): RetrofitCall<MessagesResponse>
+
+    @POST("/channels/delivered")
+    fun markDelivered(
+        @Body request: MarkDeliveredRequest,
+    ): RetrofitCall<CompletableResponse>
 }

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ChannelApi.kt

@@ -16,13 +16,15 @@
 
 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.ChannelInfoDto
 import io.getstream.chat.android.client.api2.model.dto.CommandDto
 import io.getstream.chat.android.client.api2.model.dto.ConfigDto
+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.DownstreamChannelMuteDto
@@ -309,6 +311,7 @@ internal class DomainMapping(
             image = image ?: "",
             role = role,
             invisible = invisible,
+            privacySettings = privacy_settings?.toDomain(),
             language = language ?: "",
             banned = banned,
             devices = devices.orEmpty().map { it.toDomain() },
@@ -525,6 +528,8 @@ internal class DomainMapping(
             lastRead = last_read,
             unreadMessages = unread_messages,
             lastReadMessageId = last_read_message_id,
+            lastDeliveredAt = last_delivered_at,
+            lastDeliveredMessageId = last_delivered_message_id,
         )
 
     /**
@@ -599,6 +604,7 @@ internal class DomainMapping(
         name = name ?: "",
         typingEventsEnabled = typing_events,
         readEventsEnabled = read_events,
+        deliveryEventsEnabled = delivery_events,
         connectEventsEnabled = connect_events,
         searchEnabled = search,
         isReactionsEnabled = reactions,
@@ -675,6 +681,7 @@ internal class DomainMapping(
      */
     internal fun PrivacySettingsDto.toDomain(): PrivacySettings = PrivacySettings(
         typingIndicators = typing_indicators?.toDomain(),
+        deliveryReceipts = delivery_receipts?.toDomain(),
         readReceipts = read_receipts?.toDomain(),
     )
 
@@ -685,6 +692,11 @@ internal class DomainMapping(
         enabled = enabled,
     )
 
+    /**
+     * Transforms [DeliveryReceiptsDto] to [DeliveryReceipts].
+     */
+    internal fun DeliveryReceiptsDto.toDomain() = DeliveryReceipts(enabled = enabled)
+
     /**
      * Transforms [ReadReceiptsDto] to [ReadReceipts].
      */