fix models

packages/stream_chat/lib/src/models/action.g.dart

@@ -6,7 +6,7 @@ part of 'action.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Action _$ActionFromJson(Map json) {
+Action _$ActionFromJson(Map<String, dynamic> json) {
   return Action(
     name: json['name'] as String?,
     style: json['style'] as String?,

packages/stream_chat/lib/src/models/attachment.g.dart

@@ -6,7 +6,7 @@ part of 'attachment.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Attachment _$AttachmentFromJson(Map json) {
+Attachment _$AttachmentFromJson(Map<String, dynamic> json) {
   return Attachment(
     id: json['id'] as String?,
     type: json['type'] as String,
@@ -27,19 +27,15 @@ Attachment _$AttachmentFromJson(Map json) {
     authorIcon: json['author_icon'] as String?,
     assetUrl: json['asset_url'] as String?,
     actions: (json['actions'] as List<dynamic>?)
-        ?.map((e) => Action.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Action.fromJson(e as Map<String, dynamic>))
         .toList(),
-    extraData: (json['extra_data'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    ),
+    extraData: json['extra_data'] as Map<String, dynamic>?,
     file: json['file'] == null
         ? null
-        : AttachmentFile.fromJson(
-            Map<String, dynamic>.from(json['file'] as Map)),
+        : AttachmentFile.fromJson(json['file'] as Map<String, dynamic>),
     uploadState: json['upload_state'] == null
         ? null
-        : UploadState.fromJson(
-            Map<String, dynamic>.from(json['upload_state'] as Map)),
+        : UploadState.fromJson(json['upload_state'] as Map<String, dynamic>),
   );
 }
 

packages/stream_chat/lib/src/models/attachment_file.g.dart

@@ -6,7 +6,7 @@ part of 'attachment_file.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-AttachmentFile _$AttachmentFileFromJson(Map json) {
+AttachmentFile _$AttachmentFileFromJson(Map<String, dynamic> json) {
   return AttachmentFile(
     path: json['path'] as String?,
     name: json['name'] as String?,
@@ -23,14 +23,14 @@ Map<String, dynamic> _$AttachmentFileToJson(AttachmentFile instance) =>
       'size': instance.size,
     };
 
-_$Preparing _$_$PreparingFromJson(Map json) {
+_$Preparing _$_$PreparingFromJson(Map<String, dynamic> json) {
   return _$Preparing();
 }
 
 Map<String, dynamic> _$_$PreparingToJson(_$Preparing instance) =>
     <String, dynamic>{};
 
-_$InProgress _$_$InProgressFromJson(Map json) {
+_$InProgress _$_$InProgressFromJson(Map<String, dynamic> json) {
   return _$InProgress(
     uploaded: json['uploaded'] as int,
     total: json['total'] as int,
@@ -43,14 +43,14 @@ Map<String, dynamic> _$_$InProgressToJson(_$InProgress instance) =>
       'total': instance.total,
     };
 
-_$Success _$_$SuccessFromJson(Map json) {
+_$Success _$_$SuccessFromJson(Map<String, dynamic> json) {
   return _$Success();
 }
 
 Map<String, dynamic> _$_$SuccessToJson(_$Success instance) =>
     <String, dynamic>{};
 
-_$Failed _$_$FailedFromJson(Map json) {
+_$Failed _$_$FailedFromJson(Map<String, dynamic> json) {
   return _$Failed(
     error: json['error'] as String,
   );

packages/stream_chat/lib/src/models/channel_config.g.dart

@@ -6,11 +6,11 @@ part of 'channel_config.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-ChannelConfig _$ChannelConfigFromJson(Map json) {
+ChannelConfig _$ChannelConfigFromJson(Map<String, dynamic> json) {
   return ChannelConfig(
     automod: json['automod'] as String?,
     commands: (json['commands'] as List<dynamic>?)
-        ?.map((e) => Command.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Command.fromJson(e as Map<String, dynamic>))
         .toList(),
     connectEvents: json['connect_events'] as bool?,
     createdAt: json['created_at'] == null

packages/stream_chat/lib/src/models/channel_model.g.dart

@@ -6,18 +6,15 @@ part of 'channel_model.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-ChannelModel _$ChannelModelFromJson(Map json) {
+ChannelModel _$ChannelModelFromJson(Map<String, dynamic> json) {
   return ChannelModel(
     id: json['id'] as String?,
     type: json['type'] as String?,
     cid: json['cid'] as String,
-    config: ChannelConfig.fromJson(
-        Map<String, dynamic>.from(json['config'] as Map)),
+    config: ChannelConfig.fromJson(json['config'] as Map<String, dynamic>),
     createdBy: json['created_by'] == null
         ? null
-        : User.fromJson((json['created_by'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          )),
+        : User.fromJson(json['created_by'] as Map<String, dynamic>?),
     frozen: json['frozen'] as bool,
     lastMessageAt: json['last_message_at'] == null
         ? null
@@ -28,9 +25,7 @@ ChannelModel _$ChannelModelFromJson(Map json) {
         ? null
         : DateTime.parse(json['deleted_at'] as String),
     memberCount: json['member_count'] as int,
-    extraData: (json['extra_data'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    ),
+    extraData: json['extra_data'] as Map<String, dynamic>?,
     team: json['team'] as String?,
   );
 }

packages/stream_chat/lib/src/models/channel_state.g.dart

@@ -6,36 +6,27 @@ part of 'channel_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-ChannelState _$ChannelStateFromJson(Map json) {
+ChannelState _$ChannelStateFromJson(Map<String, dynamic> json) {
   return ChannelState(
     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) => e == null
-            ? null
-            : Member.fromJson(Map<String, dynamic>.from(e as Map)))
+        .map((e) =>
+            e == null ? null : Member.fromJson(e as Map<String, dynamic>))
         .toList(),
     pinnedMessages: (json['pinned_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(),
     watcherCount: json['watcher_count'] as int?,
     watchers: (json['watchers'] 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(),
     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/models/command.g.dart

@@ -6,7 +6,7 @@ part of 'command.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Command _$CommandFromJson(Map json) {
+Command _$CommandFromJson(Map<String, dynamic> json) {
   return Command(
     name: json['name'] as String?,
     description: json['description'] as String?,

packages/stream_chat/lib/src/models/device.g.dart

@@ -6,7 +6,7 @@ part of 'device.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Device _$DeviceFromJson(Map json) {
+Device _$DeviceFromJson(Map<String, dynamic> json) {
   return Device(
     id: json['id'] as String,
     pushProvider: json['push_provider'] as String?,

packages/stream_chat/lib/src/models/event.g.dart

@@ -6,7 +6,7 @@ part of 'event.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Event _$EventFromJson(Map json) {
+Event _$EventFromJson(Map<String, dynamic> json) {
   return Event(
     type: json['type'] as String?,
     cid: json['cid'] as String?,
@@ -16,41 +16,29 @@ Event _$EventFromJson(Map json) {
         : DateTime.parse(json['created_at'] as String),
     me: json['me'] == null
         ? null
-        : OwnUser.fromJson((json['me'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          )),
+        : OwnUser.fromJson(json['me'] as Map<String, dynamic>?),
     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>?),
     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>?),
     totalUnreadCount: json['total_unread_count'] as int?,
     unreadChannels: json['unread_channels'] as int?,
     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>?),
     online: json['online'] as bool?,
     channel: json['channel'] == null
         ? null
-        : EventChannel.fromJson((json['channel'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          )),
+        : EventChannel.fromJson(json['channel'] as Map<String, dynamic>?),
     member: json['member'] == null
         ? null
-        : Member.fromJson(Map<String, dynamic>.from(json['member'] as Map)),
+        : Member.fromJson(json['member'] as Map<String, dynamic>),
     channelId: json['channel_id'] as String?,
     channelType: json['channel_type'] as String?,
     parentId: json['parent_id'] as String?,
-    extraData: (json['extra_data'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    ),
+    extraData: json['extra_data'] as Map<String, dynamic>?,
   )..isLocal = json['is_local'] as bool?;
 }
 
@@ -85,21 +73,18 @@ Map<String, dynamic> _$EventToJson(Event instance) {
   return val;
 }
 
-EventChannel _$EventChannelFromJson(Map json) {
+EventChannel _$EventChannelFromJson(Map<String, dynamic> json) {
   return EventChannel(
     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(),
     id: json['id'] as String?,
     type: json['type'] as String?,
     cid: json['cid'] as String,
-    config: ChannelConfig.fromJson(
-        Map<String, dynamic>.from(json['config'] as Map)),
+    config: ChannelConfig.fromJson(json['config'] as Map<String, dynamic>),
     createdBy: json['created_by'] == null
         ? null
-        : User.fromJson((json['created_by'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          )),
+        : User.fromJson(json['created_by'] as Map<String, dynamic>?),
     frozen: json['frozen'] as bool,
     lastMessageAt: json['last_message_at'] == null
         ? null
@@ -110,9 +95,7 @@ EventChannel _$EventChannelFromJson(Map json) {
         ? null
         : DateTime.parse(json['deleted_at'] as String),
     memberCount: json['member_count'] as int,
-    extraData: (json['extra_data'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    ),
+    extraData: json['extra_data'] as Map<String, dynamic>?,
   );
 }
 

packages/stream_chat/lib/src/models/member.g.dart

@@ -6,13 +6,11 @@ part of 'member.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Member _$MemberFromJson(Map json) {
+Member _$MemberFromJson(Map<String, dynamic> json) {
   return Member(
     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>?),
     inviteAcceptedAt: json['invite_accepted_at'] == null
         ? null
         : DateTime.parse(json['invite_accepted_at'] as String),

packages/stream_chat/lib/src/models/message.g.dart

@@ -6,49 +6,39 @@ part of 'message.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Message _$MessageFromJson(Map json) {
+Message _$MessageFromJson(Map<String, dynamic> json) {
   return Message(
     id: json['id'] as String?,
     text: json['text'] as String,
     type: json['type'] as String,
     attachments: (json['attachments'] as List<dynamic>?)
-        ?.map((e) => Attachment.fromJson(Map<String, dynamic>.from(e as Map)))
+        ?.map((e) => Attachment.fromJson(e as Map<String, dynamic>))
         .toList(),
     mentionedUsers: (json['mentioned_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(),
     silent: json['silent'] as bool?,
     shadowed: json['shadowed'] as bool?,
-    reactionCounts: (json['reaction_counts'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e as int),
+    reactionCounts: (json['reaction_counts'] as Map<String, dynamic>?)?.map(
+      (k, e) => MapEntry(k, e as int),
     ),
-    reactionScores: (json['reaction_scores'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e as int),
+    reactionScores: (json['reaction_scores'] as Map<String, dynamic>?)?.map(
+      (k, e) => MapEntry(k, e as int),
     ),
     latestReactions: (json['latest_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(),
     ownReactions: (json['own_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(),
     parentId: json['parent_id'] as String?,
     quotedMessage: json['quoted_message'] == null
         ? null
-        : Message.fromJson((json['quoted_message'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          )),
+        : Message.fromJson(json['quoted_message'] as Map<String, dynamic>?),
     quotedMessageId: json['quoted_message_id'] as String?,
     replyCount: json['reply_count'] as int?,
     threadParticipants: (json['thread_participants'] 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(),
     showInChannel: json['show_in_channel'] as bool?,
     command: json['command'] as String?,
@@ -56,9 +46,7 @@ Message _$MessageFromJson(Map json) {
     updatedAt: DateTime.parse(json['updated_at'] 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>?),
     pinned: json['pinned'] as bool?,
     pinnedAt: json['pinned_at'] == null
         ? null
@@ -68,12 +56,8 @@ Message _$MessageFromJson(Map json) {
         : DateTime.parse(json['pin_expires'] as String),
     pinnedBy: json['pinned_by'] == null
         ? null
-        : User.fromJson((json['pinned_by'] as Map?)?.map(
-            (k, e) => MapEntry(k as String, e),
-          )),
-    extraData: (json['extra_data'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    ),
+        : User.fromJson(json['pinned_by'] as Map<String, dynamic>?),
+    extraData: json['extra_data'] as Map<String, dynamic>?,
     deletedAt: json['deleted_at'] == null
         ? null
         : DateTime.parse(json['deleted_at'] as String),
@@ -123,10 +107,10 @@ Map<String, dynamic> _$MessageToJson(Message instance) {
   return val;
 }
 
-TranslatedMessage _$TranslatedMessageFromJson(Map json) {
+TranslatedMessage _$TranslatedMessageFromJson(Map<String, dynamic> json) {
   return TranslatedMessage(
-    (json['i18n'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e as String),
+    (json['i18n'] as Map<String, dynamic>?)?.map(
+      (k, e) => MapEntry(k, e as String),
     ),
   );
 }

packages/stream_chat/lib/src/models/mute.g.dart

@@ -6,18 +6,14 @@ part of 'mute.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Mute _$MuteFromJson(Map json) {
+Mute _$MuteFromJson(Map<String, dynamic> json) {
   return Mute(
     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>?),
     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>?),
     createdAt: json['created_at'] == null
         ? null
         : DateTime.parse(json['created_at'] as String),

packages/stream_chat/lib/src/models/own_user.g.dart

@@ -6,19 +6,18 @@ part of 'own_user.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-OwnUser _$OwnUserFromJson(Map json) {
-  print(json);
+OwnUser _$OwnUserFromJson(Map<String, dynamic> json) {
   return OwnUser(
     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(),
     mutes: (json['mutes'] as List<dynamic>)
-        .map((e) => Mute.fromJson(Map<String, dynamic>.from(e as Map)))
+        .map((e) => Mute.fromJson(e as Map<String, dynamic>))
         .toList(),
     totalUnreadCount: json['total_unread_count'] as int,
     unreadChannels: json['unread_channels'] as int?,
     channelMutes: (json['channel_mutes'] as List<dynamic>)
-        .map((e) => Mute.fromJson(Map<String, dynamic>.from(e as Map)))
+        .map((e) => Mute.fromJson(e as Map<String, dynamic>))
         .toList(),
     id: json['id'] as String,
     role: json['role'] as String,
@@ -28,7 +27,7 @@ OwnUser _$OwnUserFromJson(Map json) {
         ? null
         : DateTime.parse(json['last_active'] as String),
     online: json['online'] as bool,
-    extraData: Map<String, dynamic>.from(json['extra_data'] as Map),
+    extraData: json['extra_data'] as Map<String, dynamic>,
     banned: json['banned'] as bool,
   );
 }

packages/stream_chat/lib/src/models/reaction.g.dart

@@ -6,19 +6,15 @@ part of 'reaction.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Reaction _$ReactionFromJson(Map json) {
+Reaction _$ReactionFromJson(Map<String, dynamic> json) {
   return Reaction(
     messageId: json['message_id'] as String?,
     createdAt: DateTime.parse(json['created_at'] as String),
     type: json['type'] as String,
-    user: User.fromJson((json['user'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    )),
+    user: User.fromJson(json['user'] as Map<String, dynamic>?),
     userId: json['user_id'] as String?,
     score: json['score'] as int,
-    extraData: (json['extra_data'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    ),
+    extraData: json['extra_data'] as Map<String, dynamic>?,
   );
 }
 

packages/stream_chat/lib/src/models/read.g.dart

@@ -6,12 +6,10 @@ part of 'read.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Read _$ReadFromJson(Map json) {
+Read _$ReadFromJson(Map<String, dynamic> json) {
   return Read(
     lastRead: DateTime.parse(json['last_read'] as String),
-    user: User.fromJson((json['user'] as Map?)?.map(
-      (k, e) => MapEntry(k as String, e),
-    )),
+    user: User.fromJson(json['user'] as Map<String, dynamic>?),
     unreadMessages: json['unread_messages'] as int,
   );
 }

packages/stream_chat/lib/src/models/user.g.dart

@@ -6,7 +6,7 @@ part of 'user.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-User _$UserFromJson(Map json) {
+User _$UserFromJson(Map<String, dynamic> json) {
   return User(
     id: json['id'] as String,
     role: json['role'] as String,
@@ -16,7 +16,7 @@ User _$UserFromJson(Map json) {
         ? null
         : DateTime.parse(json['last_active'] as String),
     online: json['online'] as bool,
-    extraData: Map<String, dynamic>.from(json['extra_data'] as Map),
+    extraData: json['extra_data'] as Map<String, dynamic>,
     banned: json['banned'] as bool,
     teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
   );