Skip to content

Commit 5764abe

Browse files
committed
Rename deliveredReads to deliveredReadsOf
1 parent 22c4622 commit 5764abe

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2659,7 +2659,7 @@ public final class io/getstream/chat/android/client/extensions/ChannelExtensionK
26592659
public static final fun countUnreadMentionsForUser (Lio/getstream/chat/android/models/Channel;Lio/getstream/chat/android/models/User;)I
26602660
public static final fun currentUserUnreadCount (Lio/getstream/chat/android/models/Channel;Ljava/lang/String;)I
26612661
public static synthetic fun currentUserUnreadCount$default (Lio/getstream/chat/android/models/Channel;Ljava/lang/String;ILjava/lang/Object;)I
2662-
public static final fun deliveredReads (Lio/getstream/chat/android/models/Channel;Lio/getstream/chat/android/models/Message;)Ljava/util/List;
2662+
public static final fun deliveredReadsOf (Lio/getstream/chat/android/models/Channel;Lio/getstream/chat/android/models/Message;)Ljava/util/List;
26632663
public static final fun isAnonymousChannel (Lio/getstream/chat/android/models/Channel;)Z
26642664
public static final fun isArchive (Lio/getstream/chat/android/models/Channel;)Z
26652665
public static final fun isMutedFor (Lio/getstream/chat/android/models/Channel;Lio/getstream/chat/android/models/User;)Z

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,18 @@ public fun Channel.userRead(userId: UserId): ChannelUserRead? =
131131
read.firstOrNull { read -> read.user.id == userId }
132132

133133
/**
134-
* Returns a list of [ChannelUserRead] objects representing users who have read the given [message].
134+
* Returns a list of [ChannelUserRead] objects representing which ones have
135+
* delivered the given [message].
136+
*
137+
* A message is considered delivered to a user if:
138+
* - The user is not the sender of the message
139+
* - The user has received (delivered) the message
135140
*
136141
* @param message The [Message] object for which to find delivered reads.
137-
* @return A list of [ChannelUserRead] objects for users who have read the message
142+
* @return A list of [ChannelUserRead] objects representing users who have delivered the message.
138143
*/
139-
public fun Channel.deliveredReads(message: Message): List<ChannelUserRead> =
144+
public fun Channel.deliveredReadsOf(message: Message): List<ChannelUserRead> =
140145
read.filter { read ->
141-
(read.lastDeliveredAt ?: NEVER) > message.getCreatedAtOrThrow() &&
142-
read.user.id != message.user.id
146+
read.user.id != message.user.id &&
147+
(read.lastDeliveredAt ?: NEVER) > message.getCreatedAtOrThrow()
143148
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ internal class MessageReceiptManager(
124124
if (createdAt <= userRead.lastRead) return null
125125
// Check if the last message is already marked as delivered
126126
if (createdAt <= (userRead.lastDeliveredAt ?: NEVER)) return null
127+
127128
return lastMessage
128129
}
129130

0 commit comments

Comments
 (0)