fix models

packages/stream_chat/lib/src/api/channel.dart

@@ -1830,7 +1830,7 @@ class ChannelClientState {
       final now = DateTime.now();
       var expiredMessages = channelState!.pinnedMessages
           .where((m) => m.pinExpires?.isBefore(now) == true)
-              .toList();
+          .toList();
       if (expiredMessages.isNotEmpty) {
         expiredMessages = expiredMessages
             .map((m) => m.copyWith(

packages/stream_chat/lib/src/api/requests.dart

@@ -106,6 +106,7 @@ class PaginationParams {
       );
 
   @override
+  @JsonKey(ignore: true)
   int get hashCode =>
       runtimeType.hashCode ^
       limit.hashCode ^

packages/stream_chat/lib/src/api/requests.g.dart

@@ -28,6 +28,5 @@ Map<String, dynamic> _$PaginationParamsToJson(PaginationParams instance) {
   writeNotNull('id_gte', instance.greaterThanOrEqual);
   writeNotNull('id_lt', instance.lessThan);
   writeNotNull('id_lte', instance.lessThanOrEqual);
-  val['hash_code'] = instance.hashCode;
   return val;
 }

packages/stream_chat/lib/src/api/responses.g.dart

@@ -6,17 +6,16 @@ part of 'responses.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SyncResponse _$SyncResponseFromJson(Map json) {
+SyncResponse _$SyncResponseFromJson(Map<String, dynamic> json) {
   return SyncResponse()
     ..duration = json['duration'] as String?
     ..events = (json['events'] as List<dynamic>?)
-        ?.map((e) => Event.fromJson((e as Map?)?.map(
-              (k, e) => MapEntry(k as String, e),
-            )))
+        ?.map((e) => Event.fromJson(e as Map<String, dynamic>?))
         .toList();
 }
 
-QueryChannelsResponse _$QueryChannelsResponseFromJson(Map json) {
+QueryChannelsResponse _$QueryChannelsResponseFromJson(
+    Map<String, dynamic> json) {
   return QueryChannelsResponse()
     ..duration = json['duration'] as String?
     ..channels = (json['channels'] as List<dynamic>?)
@@ -24,148 +23,127 @@ QueryChannelsResponse _$QueryChannelsResponseFromJson(Map json) {
         .toList();
 }
 
-TranslateMessageResponse _$TranslateMessageResponseFromJson(Map json) {
+TranslateMessageResponse _$TranslateMessageResponseFromJson(
+    Map<String, dynamic> json) {
   return TranslateMessageResponse()
     ..duration = json['duration'] as String?
     ..message = json['message'] == null
         ? null
-        : TranslatedMessage.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : TranslatedMessage.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-QueryMembersResponse _$QueryMembersResponseFromJson(Map json) {
+QueryMembersResponse _$QueryMembersResponseFromJson(Map<String, dynamic> json) {
   return QueryMembersResponse()
     ..duration = json['duration'] as String?
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList();
 }
 
-QueryUsersResponse _$QueryUsersResponseFromJson(Map json) {
+QueryUsersResponse _$QueryUsersResponseFromJson(Map<String, dynamic> json) {
   return QueryUsersResponse()
     ..duration = json['duration'] as String?
     ..users = (json['users'] as List<dynamic>?)
-        ?.map((e) => User.fromJson((e as Map?)?.map(
-              (k, e) => MapEntry(k as String, e),
-            )))
+        ?.map((e) => User.fromJson(e as Map<String, dynamic>?))
         .toList();
 }
 
-QueryReactionsResponse _$QueryReactionsResponseFromJson(Map json) {
+QueryReactionsResponse _$QueryReactionsResponseFromJson(
+    Map<String, dynamic> json) {
   return QueryReactionsResponse()
     ..duration = json['duration'] as String?
     ..reactions = (json['reactions'] as List<dynamic>?)
-        ?.map((e) => Reaction.fromJson((e as Map?)?.map(
-              (k, e) => MapEntry(k as String, e),
-            )))
+        ?.map((e) => Reaction.fromJson(e as Map<String, dynamic>?))
         .toList();
 }
 
-QueryRepliesResponse _$QueryRepliesResponseFromJson(Map json) {
+QueryRepliesResponse _$QueryRepliesResponseFromJson(Map<String, dynamic> json) {
   return QueryRepliesResponse()
     ..duration = json['duration'] as String?
     ..messages = (json['messages'] as List<dynamic>?)
-        ?.map((e) => Message.fromJson((e as Map?)?.map(
-              (k, e) => MapEntry(k as String, e),
-            )))
+        ?.map((e) => Message.fromJson(e as Map<String, dynamic>?))
         .toList();
 }
 
-ListDevicesResponse _$ListDevicesResponseFromJson(Map json) {
+ListDevicesResponse _$ListDevicesResponseFromJson(Map<String, dynamic> json) {
   return ListDevicesResponse()
     ..duration = json['duration'] as String?
     ..devices = (json['devices'] as List<dynamic>?)
-        ?.map((e) => Device.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Device.fromJson(e as Map<String, dynamic>))
         .toList();
 }
 
-SendFileResponse _$SendFileResponseFromJson(Map json) {
+SendFileResponse _$SendFileResponseFromJson(Map<String, dynamic> json) {
   return SendFileResponse()
     ..duration = json['duration'] as String?
     ..file = json['file'] as String?;
 }
 
-SendImageResponse _$SendImageResponseFromJson(Map json) {
+SendImageResponse _$SendImageResponseFromJson(Map<String, dynamic> json) {
   return SendImageResponse()
     ..duration = json['duration'] as String?
     ..file = json['file'] as String?;
 }
 
-SendReactionResponse _$SendReactionResponseFromJson(Map json) {
+SendReactionResponse _$SendReactionResponseFromJson(Map<String, dynamic> json) {
   return SendReactionResponse()
     ..duration = json['duration'] as String?
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : Message.fromJson(json['message'] as Map<String, dynamic>?)
     ..reaction = json['reaction'] == null
         ? null
-        : Reaction.fromJson((json['reaction'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Reaction.fromJson(json['reaction'] as Map<String, dynamic>?);
 }
 
-ConnectGuestUserResponse _$ConnectGuestUserResponseFromJson(Map json) {
+ConnectGuestUserResponse _$ConnectGuestUserResponseFromJson(
+    Map<String, dynamic> json) {
   return ConnectGuestUserResponse()
     ..duration = json['duration'] as String?
     ..accessToken = json['access_token'] as String?
     ..user = json['user'] == null
         ? null
-        : User.fromJson((json['user'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : User.fromJson(json['user'] as Map<String, dynamic>?);
 }
 
-UpdateUsersResponse _$UpdateUsersResponseFromJson(Map json) {
+UpdateUsersResponse _$UpdateUsersResponseFromJson(Map<String, dynamic> json) {
   return UpdateUsersResponse()
     ..duration = json['duration'] as String?
-    ..users = (json['users'] as Map?)?.map(
-      (k, e) => MapEntry(
-          k as String,
-          User.fromJson((e as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))),
+    ..users = (json['users'] as Map<String, dynamic>?)?.map(
+      (k, e) => MapEntry(k, User.fromJson(e as Map<String, dynamic>?)),
     );
 }
 
-UpdateMessageResponse _$UpdateMessageResponseFromJson(Map json) {
+UpdateMessageResponse _$UpdateMessageResponseFromJson(
+    Map<String, dynamic> json) {
   return UpdateMessageResponse()
     ..duration = json['duration'] as String?
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-SendMessageResponse _$SendMessageResponseFromJson(Map json) {
+SendMessageResponse _$SendMessageResponseFromJson(Map<String, dynamic> json) {
   return SendMessageResponse()
     ..duration = json['duration'] as String?
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-GetMessageResponse _$GetMessageResponseFromJson(Map json) {
+GetMessageResponse _$GetMessageResponseFromJson(Map<String, dynamic> json) {
   return GetMessageResponse()
     ..duration = json['duration'] as String?
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : Message.fromJson(json['message'] as Map<String, dynamic>?)
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?);
 }
 
-SearchMessagesResponse _$SearchMessagesResponseFromJson(Map json) {
+SearchMessagesResponse _$SearchMessagesResponseFromJson(
+    Map<String, dynamic> json) {
   return SearchMessagesResponse()
     ..duration = json['duration'] as String?
     ..results = (json['results'] as List<dynamic>?)
@@ -173,169 +151,140 @@ SearchMessagesResponse _$SearchMessagesResponseFromJson(Map json) {
         .toList();
 }
 
-GetMessagesByIdResponse _$GetMessagesByIdResponseFromJson(Map json) {
+GetMessagesByIdResponse _$GetMessagesByIdResponseFromJson(
+    Map<String, dynamic> json) {
   return GetMessagesByIdResponse()
     ..duration = json['duration'] as String?
     ..messages = (json['messages'] as List<dynamic>?)
-        ?.map((e) => Message.fromJson((e as Map?)?.map(
-              (k, e) => MapEntry(k as String, e),
-            )))
+        ?.map((e) => Message.fromJson(e as Map<String, dynamic>?))
         .toList();
 }
 
-UpdateChannelResponse _$UpdateChannelResponseFromJson(Map json) {
+UpdateChannelResponse _$UpdateChannelResponseFromJson(
+    Map<String, dynamic> json) {
   return UpdateChannelResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-PartialUpdateChannelResponse _$PartialUpdateChannelResponseFromJson(Map json) {
+PartialUpdateChannelResponse _$PartialUpdateChannelResponseFromJson(
+    Map<String, dynamic> json) {
   return PartialUpdateChannelResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList();
 }
 
-InviteMembersResponse _$InviteMembersResponseFromJson(Map json) {
+InviteMembersResponse _$InviteMembersResponseFromJson(
+    Map<String, dynamic> json) {
   return InviteMembersResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-RemoveMembersResponse _$RemoveMembersResponseFromJson(Map json) {
+RemoveMembersResponse _$RemoveMembersResponseFromJson(
+    Map<String, dynamic> json) {
   return RemoveMembersResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-SendActionResponse _$SendActionResponseFromJson(Map json) {
+SendActionResponse _$SendActionResponseFromJson(Map<String, dynamic> json) {
   return SendActionResponse()
     ..duration = json['duration'] as String?
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-AddMembersResponse _$AddMembersResponseFromJson(Map json) {
+AddMembersResponse _$AddMembersResponseFromJson(Map<String, dynamic> json) {
   return AddMembersResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-AcceptInviteResponse _$AcceptInviteResponseFromJson(Map json) {
+AcceptInviteResponse _$AcceptInviteResponseFromJson(Map<String, dynamic> json) {
   return AcceptInviteResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-RejectInviteResponse _$RejectInviteResponseFromJson(Map json) {
+RejectInviteResponse _$RejectInviteResponseFromJson(Map<String, dynamic> json) {
   return RejectInviteResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..message = json['message'] == null
         ? null
-        : Message.fromJson((json['message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ));
+        : Message.fromJson(json['message'] as Map<String, dynamic>?);
 }
 
-EmptyResponse _$EmptyResponseFromJson(Map json) {
+EmptyResponse _$EmptyResponseFromJson(Map<String, dynamic> json) {
   return EmptyResponse()..duration = json['duration'] as String?;
 }
 
-ChannelStateResponse _$ChannelStateResponseFromJson(Map json) {
+ChannelStateResponse _$ChannelStateResponseFromJson(Map<String, dynamic> json) {
   return ChannelStateResponse()
     ..duration = json['duration'] as String?
     ..channel = json['channel'] == null
         ? null
-        : ChannelModel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          ))
+        : ChannelModel.fromJson(json['channel'] as Map<String, dynamic>?)
     ..messages = (json['messages'] as List<dynamic>?)
-        ?.map((e) => Message.fromJson((e as Map?)?.map(
-              (k, e) => MapEntry(k as String, e),
-            )))
+        ?.map((e) => Message.fromJson(e as Map<String, dynamic>?))
         .toList()
     ..members = (json['members'] as List<dynamic>?)
-        ?.map((e) => Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Member.fromJson(e as Map<String, dynamic>))
         .toList()
     ..watcherCount = json['watcher_count'] as int?
     ..read = (json['read'] as List<dynamic>?)
-        ?.map((e) => Read.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Read.fromJson(e as Map<String, dynamic>))
         .toList();
 }

packages/stream_chat/lib/src/api/websocket.dart

@@ -124,10 +124,10 @@ class WebSocket {
 
   Event _decodeEvent(String source) => Event.fromJson(json.decode(source));
 
-  Completer<Event> _connectionCompleter = Completer<Event>();
+  Completer<Event?> _connectionCompleter = Completer<Event?>();
 
   /// Connect the WS using the parameters passed in the constructor
-  Future<Event>? connect() {
+  Future<Event?> connect() async {
     _manuallyDisconnected = false;
 
     if (_connecting) {