Exclude current message from unread count calculation

Author: laevandus

Sources/StreamChat/Database/DTOs/ChannelReadDTO.swift

@@ -166,9 +166,16 @@ extension NSManagedObjectContext {
         read.lastReadAt = lastReadAt.bridgeDate
         read.lastReadMessageId = lastReadMessageId
 
+        let excludesMessageId: Bool = {
+            switch unreadCriteria {
+            case .messageId: return false
+            case .messageTimestamp: return true
+            }
+        }()
         let messagesCount = unreadMessagesCount ?? MessageDTO.countOtherUserMessages(
             in: read.channel.cid,
             createdAtFrom: lastReadAt,
+            excludingMessageId: excludesMessageId ? message.id : nil,
             context: self
         )
         read.unreadMessageCount = Int32(messagesCount)

Sources/StreamChat/Database/DTOs/MessageDTO.swift

@@ -558,13 +558,17 @@ class MessageDTO: NSManagedObject {
     static func countOtherUserMessages(
         in cid: String,
         createdAtFrom: Date,
+        excludingMessageId: MessageId?,
         context: NSManagedObjectContext
     ) -> Int {
-        let subpredicates: [NSPredicate] = [
+        var subpredicates: [NSPredicate] = [
             sentMessagesPredicate(for: cid),
             .init(format: "createdAt >= %@", createdAtFrom.bridgeDate),
             .init(format: "user.currentUser == nil")
         ]
+        if let excludingMessageId {
+            subpredicates.append(.init(format: "id != %@", excludingMessageId))
+        }
 
         let request = NSFetchRequest<MessageDTO>(entityName: MessageDTO.entityName)
         request.sortDescriptors = [NSSortDescriptor(keyPath: \MessageDTO.defaultSortingKey, ascending: false)]