Merge branch 'master' into develop

GetStream · May 3, 2021 · 01b664b · 01b664b
2 parents 99a5800 + 7ece5c7
commit 01b664b
Show file tree

Hide file tree

Showing 13 changed files with 271 additions and 22 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.md b/README.md
@@ -58,3 +58,12 @@ It teaches you how to use this SDK and also shows how to make frequently require
 Every package folder includes a fully functional example with setup instructions.
 
 We also provide a set of sample apps created using the Stream Flutter SDK at [this location](https://github.com/GetStream/flutter-samples).
+
+
+## We are hiring
+
+We've recently closed a [\$38 million Series B funding round](https://techcrunch.com/2021/03/04/stream-raises-38m-as-its-chat-and-activity-feed-apis-power-communications-for-1b-users/) and we keep actively growing.
+Our APIs are used by more than a billion end-users, and you'll have a chance to make a huge impact on the product within a team of the strongest engineers all over the world.
+
+Check out our current openings and apply via [Stream's website](https://getstream.io/team/#jobs).
+
diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.5.3
+
+- fix: `StreamChatClient.connect` returns quicker when you're using the persistence package
+
+## 1.5.2
+
+- fix: `queryChannels` should throw exceptions only if no data is present in cache.
+
 ## 1.5.1
 
 - Minor fixes and improvements

diff --git a/packages/stream_chat/lib/src/client.dart b/packages/stream_chat/lib/src/client.dart
@@ -546,10 +546,10 @@ class StreamChatClient {
 
     var event = await _chatPersistenceClient?.getConnectionInfo();
 
-    await _ws.connect().then((e) async {
-      await _chatPersistenceClient?.updateConnectionInfo(e);
+    await _ws.connect().then((e) {
+      _chatPersistenceClient?.updateConnectionInfo(e);
       event = e;
-      await resync();
+      resync();
     }).catchError((err, stacktrace) {
       logger.severe('error connecting ws', err, stacktrace);
       if (err is Map) {
@@ -633,7 +633,7 @@ class StreamChatClient {
       );
       if (channels.isNotEmpty) yield channels;
 
-      if (wsConnectionStatus == ConnectionStatus.connected) {
+      try {
         final newQueryChannelsFuture = queryChannelsOnline(
           filter: filter,
           sort: sort,
@@ -648,6 +648,8 @@ class StreamChatClient {
         _queryChannelsStreams[hash] = newQueryChannelsFuture;
 
         yield await newQueryChannelsFuture;
+      } catch (_) {
+        if (channels.isEmpty) rethrow;
       }
     }
   }

diff --git a/packages/stream_chat/lib/version.dart b/packages/stream_chat/lib/version.dart
@@ -3,4 +3,4 @@ import 'package:stream_chat/src/client.dart';
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
 // ignore: constant_identifier_names
-const PACKAGE_VERSION = '1.5.1';
+const PACKAGE_VERSION = '1.5.3';
diff --git 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: 1.5.1
+version: 1.5.3
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.5.3
+
+- Updated `stream_chat_core` dependency
+
 ## 1.5.2
 
 - Fix accessibility text size overflows

diff --git 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: 1.5.2
+version: 1.5.3
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  stream_chat_flutter_core: ^1.5.1
+  stream_chat_flutter_core: ^1.5.2
   photo_view: ^0.11.0
   rxdart: ^0.25.0
   scrollable_positioned_list: ^0.1.8

diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.5.2
+
+* Update llc dependency
+
 ## 1.5.1
 
 * Improved test coverage to > 90%

diff --git 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: 1.5.1
+version: 1.5.2
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   meta: ^1.2.4
   rxdart: ^0.25.0
-  stream_chat: ^1.5.1
+  stream_chat: ^1.5.3
 
 dependency_overrides:
   stream_chat:

diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.5.2
+
+* Fix sorting by last_updated
+
 ## 1.5.1
 
 * Improved test coverage to > 95%

diff --git a/packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart b/packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart
@@ -91,16 +91,6 @@ class ChannelQueryDao extends DatabaseAccessor<MoorChatDatabase>
       return channelEntity.toChannelModel(createdBy: createdByEntity?.toUser());
     })).get();
 
-    final possibleSortingFields = cachedChannels.fold<List<String>>(
-        ChannelModel.topLevelFields,
-        (previousValue, element) =>
-            {...previousValue, ...element.extraData.keys}.toList());
-
-    // ignore: parameter_assignments
-    sort = sort
-        ?.where((s) => possibleSortingFields.contains(s.field))
-        ?.toList(growable: false);
-
     var chainedComparator = (ChannelModel a, ChannelModel b) {
       final dateA = a.lastMessageAt ?? a.createdAt;
       final dateB = b.lastMessageAt ?? b.createdAt;

diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_persistence
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Official Stream Chat Persistence library. Build your own chat experience using Dart and Flutter.
-version: 1.5.1
+version: 1.5.2
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -18,7 +18,7 @@ dependencies:
   path: ^1.7.0
   path_provider: ^1.6.27
   sqlite3_flutter_libs: ^0.4.0+1
-  stream_chat: ^1.5.1
+  stream_chat: ^1.5.3
 
 dependency_overrides:
   stream_chat: