Merge branch 'develop' into swift-6

Author: laevandus

.gitattributes

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## StreamChat
 ### 🐞 Fixed
 - Fix swipe to reply enabled when quoting a message is disabled [#3662](https://github.com/GetStream/stream-chat-swift/pull/3662)
+- Fix shadowed messages increasing the channel messages unread count [#3665](https://github.com/GetStream/stream-chat-swift/pull/3665)
 
 # [4.78.0](https://github.com/GetStream/stream-chat-swift/releases/tag/4.78.0)
 _April 24, 2025_

CHANGELOG.md

@@ -6,7 +6,6 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem 'danger', group: :danger_dependencies
 gem 'fastlane', group: :fastlane_dependencies
-gem 'jazzy'
 gem 'json'
 gem 'rubocop', '1.38', group: :rubocop_dependencies
 gem 'sinatra', group: :sinatra_dependencies

Gemfile

@@ -266,16 +266,6 @@ GEM
       mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jazzy (0.15.3)
-      cocoapods (~> 1.5)
-      mustache (~> 1.1)
-      open4 (~> 1.3)
-      redcarpet (~> 3.4)
-      rexml (>= 3.2.7, < 4.0)
-      rouge (>= 2.0.6, < 5.0)
-      sassc (~> 2.1)
-      sqlite3 (~> 1.3)
-      xcinvoke (~> 0.3.0)
     jmespath (1.6.2)
     json (2.11.3)
     jwt (2.10.1)
@@ -284,7 +274,6 @@ GEM
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liferaft (0.0.6)
     logger (1.7.0)
     method_source (1.1.0)
     mini_magick (4.13.2)
@@ -294,7 +283,6 @@ GEM
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    mustache (1.1.1)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.3.0)
@@ -329,20 +317,19 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.13)
+    rack (3.1.14)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.0)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rackup (2.2.1)
       rack (>= 3)
     rainbow (3.1.1)
     rake (13.2.1)
     rchardet (1.9.0)
-    redcarpet (3.6.1)
     regexp_parser (2.10.0)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -373,8 +360,6 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -402,8 +387,6 @@ GEM
       nokogiri (>= 1.14.3)
       xcodeproj (~> 1.27)
     sorbet-runtime (0.5.12043)
-    sqlite3 (1.7.3)
-      mini_portile2 (~> 2.8.0)
     stream-chat-ruby (3.0.0)
       faraday
       faraday-multipart
@@ -432,8 +415,6 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     word_wrap (1.0.0)
-    xcinvoke (0.3.0)
-      liferaft (~> 0.0.6)
     xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -462,7 +443,6 @@ DEPENDENCIES
   fastlane-plugin-stream_actions (= 0.3.79)
   fastlane-plugin-versioning
   faye-websocket
-  jazzy
   json
   plist
   puma

Gemfile.lock

@@ -222,6 +222,10 @@ struct ChannelReadUpdaterMiddleware: EventMiddleware {
             return .messageIsSystem
         }
 
+        if message.isShadowed {
+            return .messageIsShadowed
+        }
+
         if message.createdAt <= channelRead.lastReadAt.bridgeDate {
             return .messageIsSeen
         }
@@ -237,6 +241,7 @@ private enum UnreadSkippingReason: CustomStringConvertible {
     case messageIsSilent
     case messageIsThreadReply
     case messageIsSystem
+    case messageIsShadowed
     case messageIsSeen
     case messageIsSoftDeleted
 
@@ -254,6 +259,8 @@ private enum UnreadSkippingReason: CustomStringConvertible {
             return "Thread replies do not affect unread counts"
         case .messageIsSystem:
             return "System messages do not affect unread counts"
+        case .messageIsShadowed:
+            return "Shadowed messages do not affect unread counts"
         case .messageIsSeen:
             return "Seen messages do not affect unread counts"
         case .messageIsSoftDeleted:

Sources/StreamChat/WebSocketClient/EventMiddlewares/ChannelReadUpdaterMiddleware.swift

@@ -591,6 +591,35 @@ final class ChannelReadUpdaterMiddleware_Tests: XCTestCase {
         XCTAssertEqual(Int(read.unreadMessageCount), currentUserReadPayload.unreadMessagesCount)
     }
 
+    func test_messageNewEvent_whenMessageIsShadowed_doesNotIncrementUnreadCount() throws {
+        // WHEN
+        let shadowedMessage: MessagePayload = .dummy(
+            type: .regular,
+            messageId: .unique,
+            authorUserId: anotherUserPayload.id,
+            createdAt: currentUserReadPayload.lastReadAt.addingTimeInterval(1),
+            isShadowed: true
+        )
+
+        let messageNewEvent = try MessageNewEventDTO(
+            from: .init(
+                eventType: .messageNew,
+                cid: channelPayload.channel.cid,
+                user: anotherUserPayload,
+                message: shadowedMessage,
+                createdAt: shadowedMessage.createdAt
+            )
+        )
+
+        try database.writeSynchronously { session in
+            _ = self.middleware.handle(event: messageNewEvent, session: session)
+        }
+
+        // THEN
+        let read = try XCTUnwrap(currentUserReadDTO)
+        XCTAssertEqual(Int(read.unreadMessageCount), currentUserReadPayload.unreadMessagesCount)
+    }
+
     func test_messageNewEvent_whenMessageIsRead_doesNotIncrementUnreadCount() throws {
         // WHEN
         let regularMessageEarlierThanLastRead: MessagePayload = .dummy(