Fixed ChannelPresenter.

Author: buh

Sources/Core/Client/Client+Events.swift

@@ -19,7 +19,7 @@ public extension Client {
     ///     - eventType: an event type.
     ///     - channelId: a channeld id (optional).
     /// - Returns: an observable event.
-    func onEvent(_ eventType: EventType? = nil, for channelId: String? = nil) -> Observable<Event> {
+    func onEvent(_ eventType: EventType? = nil, channelId: String? = nil) -> Observable<Event> {
         return webSocket.response
             .filter {
                 if let channelId = channelId {

Sources/Core/Model/Message.swift

@@ -181,8 +181,14 @@ public struct Message: Codable {
         replyCount = try container.decode(Int.self, forKey: .replyCount)
         latestReactions = try container.decode([Reaction].self, forKey: .latestReactions)
         ownReactions = try container.decode([Reaction].self, forKey: .ownReactions)
-        reactionCounts = try container.decodeIfPresent(ReactionCounts.self, forKey: .reactionCounts)
         extraData = .decode(from: decoder, ExtraData.decodableTypes.first(where: { $0.isMessage }))
+        
+        if let reactionCounts = try container.decodeIfPresent(ReactionCounts.self, forKey: .reactionCounts),
+            !reactionCounts.counts.isEmpty {
+            self.reactionCounts = reactionCounts
+        } else {
+            reactionCounts = nil
+        }
     }
 
     private func checkIfTextAsAttachmentURL(_ text: String) -> Bool {

Sources/Core/Presenter/ChannelPresenter.swift

@@ -106,7 +106,7 @@ public final class ChannelPresenter: Presenter<ChatItem> {
         .filter { $0 != .none }
         .asDriver { Driver.just(ViewChanges.error(AnyError(error: $0))) }
 
-    private lazy var webSocketChanges: Driver<ViewChanges> = channel.onEvent()
+    private lazy var webSocketChanges: Driver<ViewChanges> = Client.shared.onEvent(channelId: channelId)
         .map { [weak self] in self?.parseChanges(event: $0) ?? .none }
         .filter { $0 != .none }
         .map { [weak self] in self?.mapWithEphemeralMessage($0) ?? .none }
@@ -215,7 +215,7 @@ extension ChannelPresenter {
 
             if let messageNewChannel = messageNewChannel {
                 channelMVar.set(messageNewChannel)
-            }   
+            }
 
             if channel.config.readEventsEnabled {
                 if let lastMessage = lastMessageMVar.get() {

StreamChatCoreTests/Integration Tests/ChannelTests.swift

@@ -98,19 +98,6 @@ final class ChannelTests: TestCase {
                     return nil
                 }
                 .unwrap()
-                .flatMapLatest { $0.deleteReaction(.like) }
-                .map { response -> Message? in
-                    if let reactionCounts = response.message.reactionCounts {
-                        XCTAssertEqual(reactionCounts.counts, [ReactionType.love: 1])
-                        XCTAssertEqual(reactionCounts.string, "\(ReactionType.love.emoji)1")
-                        return response.message
-                    }
-                    
-                    XCTFail("Failed to delete a reaction")
-                    
-                    return nil
-                }
-                .unwrap()
                 .flatMapLatest { $0.deleteReaction(.love) }
                 .map { response -> Message? in
                     XCTAssertNil(response.message.reactionCounts)