From b8a6d39efb662ec10564f752b89f97d246963c8c Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 29 Nov 2021 14:47:59 +0100 Subject: [PATCH 1/7] chore(llc): update changelog and bump version --- packages/stream_chat/CHANGELOG.md | 2 +- packages/stream_chat/lib/version.dart | 2 +- packages/stream_chat/pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 91908075..f5b78e2e 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,4 +1,4 @@ -## Upcoming +## 3.3.0 ✅ Added diff --git a/packages/stream_chat/lib/version.dart b/packages/stream_chat/lib/version.dart index c839a929..cc19a375 100644 --- a/packages/stream_chat/lib/version.dart +++ b/packages/stream_chat/lib/version.dart @@ -3,4 +3,4 @@ import 'package:stream_chat/src/client/client.dart'; /// Current package version /// Used in [StreamChatClient] to build the `x-stream-client` header // ignore: constant_identifier_names -const PACKAGE_VERSION = '3.2.0'; +const PACKAGE_VERSION = '3.3.0'; diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml index a723e77b..38ee620c 100644 --- a/packages/stream_chat/pubspec.yaml +++ b/packages/stream_chat/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat homepage: https://getstream.io/ description: The official Dart client for Stream Chat, a service for building chat applications. -version: 3.2.0 +version: 3.3.0 repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues From 33dcec8cb85c17b34fc817867a669a5b9c51767d Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 29 Nov 2021 14:49:06 +0100 Subject: [PATCH 2/7] chore(core): update changelog and bump version --- packages/stream_chat_flutter_core/CHANGELOG.md | 4 ++++ packages/stream_chat_flutter_core/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index 77ac23a0..9d0731aa 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.3.0 + +- Updated `stream_chat` dependency to [`3.3.0`](https://pub.dev/packages/stream_chat/changelog). + ## 3.2.0 - Updated `stream_chat` dependency to [`3.2.0`](https://pub.dev/packages/stream_chat/changelog). diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml index 85b82caa..48d104f3 100644 --- a/packages/stream_chat_flutter_core/pubspec.yaml +++ b/packages/stream_chat_flutter_core/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat_flutter_core homepage: https://github.com/GetStream/stream-chat-flutter description: Stream Chat official Flutter SDK Core. Build your own chat experience using Dart and Flutter. -version: 3.2.0 +version: 3.3.0 repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues @@ -16,7 +16,7 @@ dependencies: sdk: flutter meta: ^1.3.0 rxdart: ^0.27.0 - stream_chat: ^3.2.0 + stream_chat: ^3.3.0 dev_dependencies: dart_code_metrics: ^4.4.0 From ca513e86efd49881d193cf6240bce6fa445f1945 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 29 Nov 2021 14:51:00 +0100 Subject: [PATCH 3/7] chore(ui): update changelog and bump version --- packages/stream_chat_flutter/CHANGELOG.md | 2 +- packages/stream_chat_flutter/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index e4047b1e..1904e48d 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,4 +1,4 @@ -## Upcoming +## 3.3.0 ✅ Added diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index d89b4ccd..13300b2c 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat_flutter homepage: https://github.com/GetStream/stream-chat-flutter description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter. -version: 3.2.0 +version: 3.3.0 repository: https://github.com/GetStream/stream-chat-flutter issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues From 707bb65e938dd3e52cd92bb7b6d364be610802a0 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 29 Nov 2021 15:25:12 +0100 Subject: [PATCH 4/7] refactor(ui): rename deprecated args --- packages/stream_chat_flutter/lib/src/message_widget.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart index b82d4c31..6182df54 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget.dart @@ -514,7 +514,6 @@ class MessageWidget extends StatefulWidget { showUserAvatar: showUserAvatar ?? this.showUserAvatar, showSendingIndicator: showSendingIndicator ?? this.showSendingIndicator, showReactions: showReactions ?? this.showReactions, - allRead: allRead ?? this.allRead, showThreadReplyIndicator: showThreadReplyIndicator ?? this.showThreadReplyIndicator, showInChannelIndicator: @@ -523,7 +522,6 @@ class MessageWidget extends StatefulWidget { onLinkTap: onLinkTap ?? this.onLinkTap, showReactionPickerIndicator: showReactionPickerIndicator ?? this.showReactionPickerIndicator, - readList: readList ?? this.readList, onShowMessage: onShowMessage ?? this.onShowMessage, onReturnAction: onReturnAction ?? this.onReturnAction, showUsername: showUsername ?? this.showUsername, From 06cc4acb2e86090cc489187afe7c46676bc578b3 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 29 Nov 2021 20:07:45 +0530 Subject: [PATCH 5/7] removed params --- .../lib/src/db/chat_persistence_client.dart | 1 - .../lib/src/message_list_view.dart | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/packages/stream_chat/lib/src/db/chat_persistence_client.dart b/packages/stream_chat/lib/src/db/chat_persistence_client.dart index aa0ac245..98f6a364 100644 --- a/packages/stream_chat/lib/src/db/chat_persistence_client.dart +++ b/packages/stream_chat/lib/src/db/chat_persistence_client.dart @@ -82,7 +82,6 @@ abstract class ChatPersistenceClient { members: data[0] as List, // ignore: cast_nullable_to_non_nullable read: data[1] as List, - // ignore: cast_nullable_to_non_nullable channel: data[2] as ChannelModel?, // ignore: cast_nullable_to_non_nullable messages: data[3] as List, diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart index c61ccfed..40e74f23 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart @@ -1074,15 +1074,6 @@ class _MessageListViewState extends State { ); } - final channel = streamChannel!.channel; - final readList = channel.state?.read.where((read) { - if (read.user.id == userId) return false; - return read.lastRead.isAfter(message.createdAt) || - read.lastRead.isAtSameMomentAs(message.createdAt); - }).toList() ?? - []; - - final allRead = readList.length >= (channel.memberCount ?? 0) - 1; final hasFileAttachment = message.attachments.any((it) => it.type == 'file'); @@ -1211,8 +1202,6 @@ class _MessageListViewState extends State { messageTheme: isMyMessage ? _streamTheme.ownMessageTheme : _streamTheme.otherMessageTheme, - readList: readList, - allRead: allRead, onReturnAction: (action) { switch (action) { case ReturnActionType.none: From 85c29992e5554b2a57f20320763a654e9cb4b9bc Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 29 Nov 2021 15:45:44 +0100 Subject: [PATCH 6/7] refactor(llc): rename deprecated tests --- .../core/http/stream_http_client_test.dart | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/packages/stream_chat/test/src/core/http/stream_http_client_test.dart b/packages/stream_chat/test/src/core/http/stream_http_client_test.dart index a42a5324..6abed8ae 100644 --- a/packages/stream_chat/test/src/core/http/stream_http_client_test.dart +++ b/packages/stream_chat/test/src/core/http/stream_http_client_test.dart @@ -123,27 +123,6 @@ void main() { verify(() => logger.severe(any())).called(greaterThan(0)); }); - test('`.lock` should lock the dio client', () async { - final client = StreamHttpClient('api-key'); - expect(client.httpClient.interceptors.requestLock.locked, isFalse); - client.lock(); - expect(client.httpClient.interceptors.requestLock.locked, isTrue); - }); - - test('`.unlock` should unlock the dio client', () async { - final client = StreamHttpClient('api-key'); - expect(client.httpClient.interceptors.requestLock.locked, isFalse); - client.lock(); - expect(client.httpClient.interceptors.requestLock.locked, isTrue); - client.unlock(); - expect(client.httpClient.interceptors.requestLock.locked, isFalse); - }); - - test('`.clear` should clear and unlock the dio client', () async { - final client = StreamHttpClient('api-key')..clear(); - expect(client.httpClient.interceptors.requestLock.locked, isFalse); - }); - test('`.close` should close the dio client', () async { final client = StreamHttpClient('api-key')..close(force: true); try { From 3bd545e5041c608988b31ec5d41c9fdff238a0a4 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Mon, 29 Nov 2021 16:29:22 +0100 Subject: [PATCH 7/7] minor fixes --- packages/stream_chat/lib/src/client/channel.dart | 2 +- packages/stream_chat_flutter/lib/src/message_input.dart | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index b4a29ca4..1bba9c84 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -1603,7 +1603,7 @@ class ChannelClientState { message.createdAt.isBefore( DateTime.now().subtract( const Duration( - seconds: 1, + seconds: 5, ), ), ), diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart index 022963e9..de2b9d09 100644 --- a/packages/stream_chat_flutter/lib/src/message_input.dart +++ b/packages/stream_chat_flutter/lib/src/message_input.dart @@ -1168,7 +1168,9 @@ class MessageInputState extends State { } Widget _buildMentionsOverlayEntry() { - if (textEditingController.value.selection.start < 0) { + final channel = StreamChannel.of(context).channel; + if (textEditingController.value.selection.start < 0 || + channel.state == null) { return const Offstage(); } @@ -1197,7 +1199,7 @@ class MessageInputState extends State { query: query, mentionAllAppUsers: widget.mentionAllAppUsers, client: StreamChat.of(context).client, - channel: StreamChannel.of(context).channel, + channel: channel, size: Size(renderObject.size.width - 16, 400), mentionsTileBuilder: tileBuilder, onMentionUserTap: (user) {