From 0536d225bb1b046936d2e8dd9c03f348ae178c0c Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Fri, 19 Nov 2021 16:24:03 +0530 Subject: [PATCH 1/6] fixed unread indicator --- packages/stream_chat/lib/src/client/channel.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index e7c2d459..c219a120 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -1860,10 +1860,13 @@ class ChannelClientState { (m) => m.user.id == message.user?.id, ) != null; + final isThreadMessage = message.parentId != null; + return !message.silent && !message.shadowed && message.user?.id != userId && - !userIsMuted; + !userIsMuted && + !isThreadMessage; } /// Update threads with updated information about messages. From a678ecc2e91f14d0bf60428bca38badefb4eef40 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 22 Nov 2021 14:26:29 +0530 Subject: [PATCH 2/6] changelog --- packages/stream_chat/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 4b409536..57a39716 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🐞 Fixed + +- Fixed unread count indicator + ## 3.2.0 🐞 Fixed From a7b9feaab739056c4ffb5745e17228304f232d76 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 22 Nov 2021 14:28:56 +0530 Subject: [PATCH 3/6] changelog --- packages/stream_chat/CHANGELOG.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index cc5a9203..080ea1f8 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,16 +1,14 @@ -## Upcoming - -🐞 Fixed - -- `closeConnection()` now uses `normalClosure` status when closing websocket. -- Fixed unread count indicator - ## Upcoming ✅ Added - Extra properties added to `PaginationParams` to aid in fetching messages. +🐞 Fixed + +- `closeConnection()` now uses `normalClosure` status when closing websocket. +- Fixed unread count indicator + ## 3.2.0 🐞 Fixed From 7c5263df0ef24eb93fedff75d709710836e2ec2e Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 22 Nov 2021 14:58:00 +0530 Subject: [PATCH 4/6] testing --- packages/stream_chat/lib/src/client/channel.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index c219a120..b4ee04d3 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -1860,13 +1860,13 @@ class ChannelClientState { (m) => m.user.id == message.user?.id, ) != null; - final isThreadMessage = message.parentId != null; + //final isThreadMessage = message.parentId != null; return !message.silent && !message.shadowed && message.user?.id != userId && - !userIsMuted && - !isThreadMessage; + !userIsMuted; + //&& !isThreadMessage; } /// Update threads with updated information about messages. From e44c20baf946237520fb7e159b06b97a55ee5aac Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 22 Nov 2021 15:21:54 +0530 Subject: [PATCH 5/6] testing --- packages/stream_chat/lib/src/client/channel.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index b4ee04d3..c219a120 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -1860,13 +1860,13 @@ class ChannelClientState { (m) => m.user.id == message.user?.id, ) != null; - //final isThreadMessage = message.parentId != null; + final isThreadMessage = message.parentId != null; return !message.silent && !message.shadowed && message.user?.id != userId && - !userIsMuted; - //&& !isThreadMessage; + !userIsMuted && + !isThreadMessage; } /// Update threads with updated information about messages. From ee3035d62b28ddcc0f4e9934fe78cf85fd1dc37c Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Tue, 23 Nov 2021 10:26:37 +0100 Subject: [PATCH 6/6] Update packages/stream_chat/CHANGELOG.md --- packages/stream_chat/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 080ea1f8..8e54b7c1 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -7,7 +7,7 @@ 🐞 Fixed - `closeConnection()` now uses `normalClosure` status when closing websocket. -- Fixed unread count indicator +- Fixed local unread count indicator increasing for thread replies ## 3.2.0