From d0933ac252915b304b3372f561eab09a6347e666 Mon Sep 17 00:00:00 2001 From: Freek van de Ven Date: Fri, 24 Nov 2023 13:31:20 +0100 Subject: [PATCH] fix: unread chats bug --- CHANGELOG.md | 4 ++++ packages/flutter_community_chat/pubspec.yaml | 6 +++--- .../lib/service/firebase_chat_service.dart | 6 +++--- packages/flutter_community_chat_firebase/pubspec.yaml | 4 ++-- packages/flutter_community_chat_interface/pubspec.yaml | 2 +- packages/flutter_community_chat_view/example/pubspec.yaml | 2 +- packages/flutter_community_chat_view/pubspec.yaml | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8089ae7..6618de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.2 - November 24 2023 + +- Fix groupchats seen as personal chat when there are unread messages + ## 0.4.1 - November 22 2023 - Add groupName for groupchat avatarbuilder diff --git a/packages/flutter_community_chat/pubspec.yaml b/packages/flutter_community_chat/pubspec.yaml index 9bc0680..ab05cc3 100644 --- a/packages/flutter_community_chat/pubspec.yaml +++ b/packages/flutter_community_chat/pubspec.yaml @@ -4,7 +4,7 @@ name: flutter_community_chat description: A new Flutter package project. -version: 0.4.1 +version: 0.4.2 publish_to: none @@ -19,12 +19,12 @@ dependencies: git: url: https://github.com/Iconica-Development/flutter_community_chat path: packages/flutter_community_chat_view - ref: 0.4.1 + ref: 0.4.2 flutter_community_chat_interface: git: url: https://github.com/Iconica-Development/flutter_community_chat path: packages/flutter_community_chat_interface - ref: 0.4.1 + ref: 0.4.2 dev_dependencies: flutter_lints: ^2.0.0 diff --git a/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart b/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart index f9c1933..1b7d3eb 100644 --- a/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart +++ b/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart @@ -289,7 +289,7 @@ class FirebaseChatService implements ChatService { .doc(chatId) .get(); - if (chatCollection.exists) { + if (chatCollection.exists && chatCollection.data()?['users'] != null) { var otherUser = chatCollection.data()?['users'].firstWhere( (element) => element != currentUser?.id, ); @@ -317,7 +317,7 @@ class FirebaseChatService implements ChatService { } } return GroupChatModel( - id: chat?.id ?? '', + id: chat?.id ?? chatId, title: chat?.title ?? '', imageUrl: chat?.imageUrl ?? '', users: users, @@ -376,7 +376,7 @@ class FirebaseChatService implements ChatService { return chat; } - List userIds = [ + var userIds = [ currentUser!.id!, chat.user.id!, ]; diff --git a/packages/flutter_community_chat_firebase/pubspec.yaml b/packages/flutter_community_chat_firebase/pubspec.yaml index bef69b8..cc07820 100644 --- a/packages/flutter_community_chat_firebase/pubspec.yaml +++ b/packages/flutter_community_chat_firebase/pubspec.yaml @@ -4,7 +4,7 @@ name: flutter_community_chat_firebase description: A new Flutter package project. -version: 0.4.1 +version: 0.4.2 publish_to: none environment: @@ -23,7 +23,7 @@ dependencies: git: url: https://github.com/Iconica-Development/flutter_community_chat path: packages/flutter_community_chat_interface - ref: 0.4.1 + ref: 0.4.2 dev_dependencies: flutter_lints: ^2.0.0 diff --git a/packages/flutter_community_chat_interface/pubspec.yaml b/packages/flutter_community_chat_interface/pubspec.yaml index 4caa8b6..748d5b2 100644 --- a/packages/flutter_community_chat_interface/pubspec.yaml +++ b/packages/flutter_community_chat_interface/pubspec.yaml @@ -4,7 +4,7 @@ name: flutter_community_chat_interface description: A new Flutter package project. -version: 0.4.1 +version: 0.4.2 publish_to: none environment: diff --git a/packages/flutter_community_chat_view/example/pubspec.yaml b/packages/flutter_community_chat_view/example/pubspec.yaml index 2479779..5ef91ae 100644 --- a/packages/flutter_community_chat_view/example/pubspec.yaml +++ b/packages/flutter_community_chat_view/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: git: url: https://github.com/Iconica-Development/flutter_community_chat path: packages/flutter_community_chat_view - ref: 0.4.1 + ref: 0.4.2 dev_dependencies: flutter_test: diff --git a/packages/flutter_community_chat_view/pubspec.yaml b/packages/flutter_community_chat_view/pubspec.yaml index d02c31c..9be88b0 100644 --- a/packages/flutter_community_chat_view/pubspec.yaml +++ b/packages/flutter_community_chat_view/pubspec.yaml @@ -4,7 +4,7 @@ name: flutter_community_chat_view description: A standard flutter package. -version: 0.4.1 +version: 0.4.2 publish_to: none @@ -20,7 +20,7 @@ dependencies: git: url: https://github.com/Iconica-Development/flutter_community_chat path: packages/flutter_community_chat_interface - ref: 0.4.1 + ref: 0.4.2 cached_network_image: ^3.2.2 flutter_image_picker: git: