migrate to nnbd

Signed-off-by: Sahil Kumar <[email protected]>
2021-04-20 19:52:06 +05:30
parent 8f1f7b0b68
commit 3bb1b11ee8
59 changed files with 642 additions and 589 deletions
@@ -4,8 +4,8 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 /// Useful mapping functions for [ChannelEntity]
 extension ChannelEntityX on ChannelEntity {
  /// Maps a [ChannelEntity] into [ChannelModel]
-  ChannelModel toChannelModel({User createdBy}) {
-    final config = ChannelConfig.fromJson(this.config ?? {});
+  ChannelModel toChannelModel({User? createdBy}) {
+    final config = ChannelConfig.fromJson(this.config);
    return ChannelModel(
      id: id,
      config: config,
@@ -24,11 +24,11 @@ extension ChannelEntityX on ChannelEntity {

  /// Maps a [ChannelEntity] into [ChannelState]
  ChannelState toChannelState({
-    User createdBy,
-    List<Member> members,
-    List<Read> reads,
-    List<Message> messages,
-    List<Message> pinnedMessages,
+    User? createdBy,
+    List<Member> members = const [],
+    List<Read> reads = const [],
+    List<Message> messages = const [],
+    List<Message> pinnedMessages = const [],
  }) =>
      ChannelState(
        members: members,
@@ -46,7 +46,7 @@ extension ChannelModelX on ChannelModel {
        id: id,
        type: type,
        cid: cid,
-        config: config?.toJson(),
+        config: config.toJson(),
        frozen: frozen,
        lastMessageAt: lastMessageAt,
        createdAt: createdAt,
@@ -5,7 +5,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 extension ConnectionEventX on ConnectionEventEntity {
  /// Maps a [ConnectionEventEntity] into [Event]
  Event toEvent() => Event(
-        me: ownUser != null ? OwnUser.fromJson(ownUser) : null,
+        me: ownUser != null ? OwnUser.fromJson(ownUser!) : null,
        totalUnreadCount: totalUnreadCount,
        unreadChannels: unreadChannels,
      );
@@ -4,7 +4,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 /// Useful mapping functions for [MemberEntity]
 extension MemberEntityX on MemberEntity {
  /// Maps a [MemberEntity] into [Member]
-  Member toMember({User user}) => Member(
+  Member toMember({User? user}) => Member(
        user: user,
        userId: userId,
        banned: banned,
@@ -22,8 +22,8 @@ extension MemberEntityX on MemberEntity {
 /// Useful mapping functions for [Member]
 extension MemberX on Member {
  /// Maps a [Member] into [MemberEntity]
-  MemberEntity toEntity({String cid}) => MemberEntity(
-        userId: user?.id,
+  MemberEntity toEntity({required String cid}) => MemberEntity(
+        userId: user!.id,
        banned: banned,
        shadowBanned: shadowBanned,
        channelCid: cid,
@@ -7,22 +7,22 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 extension MessageEntityX on MessageEntity {
  /// Maps a [MessageEntity] into [Message]
  Message toMessage({
-    User user,
-    User pinnedBy,
-    List<Reaction> latestReactions,
-    List<Reaction> ownReactions,
-    Message quotedMessage,
+    User? user,
+    User? pinnedBy,
+    List<Reaction>? latestReactions,
+    List<Reaction>? ownReactions,
+    Message? quotedMessage,
  }) =>
      Message(
        shadowed: shadowed,
        latestReactions: latestReactions,
        ownReactions: ownReactions,
-        attachments: attachments?.map((it) {
+        attachments: attachments.map((it) {
          final json = jsonDecode(it);
          return Attachment.fromData(json);
-        })?.toList(),
+        }).toList(),
        createdAt: createdAt,
-        extraData: extraData,
+        extraData: extraData ?? <String, Object>{},
        updatedAt: updatedAt,
        id: id,
        type: type,
@@ -48,10 +48,9 @@ extension MessageEntityX on MessageEntity {
 /// Useful mapping functions for [Message]
 extension MessageX on Message {
  /// Maps a [Message] into [MessageEntity]
-  MessageEntity toEntity({String cid}) => MessageEntity(
+  MessageEntity toEntity({String? cid}) => MessageEntity(
        id: id,
-        attachments:
-            attachments?.map((it) => jsonEncode(it.toData()))?.toList(),
+        attachments: attachments.map((it) => jsonEncode(it.toData())).toList(),
        channelCid: cid,
        type: type,
        parentId: parentId,
@@ -63,6 +62,7 @@ extension MessageX on Message {
        replyCount: replyCount,
        reactionScores: reactionScores,
        reactionCounts: reactionCounts,
+        mentionedUsers: mentionedUsers.map(jsonEncode).toList(),
        status: status,
        updatedAt: updatedAt,
        extraData: extraData,
@@ -7,22 +7,22 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 extension PinnedMessageEntityX on PinnedMessageEntity {
  /// Maps a [PinnedMessageEntity] into [Message]
  Message toMessage({
-    User user,
-    User pinnedBy,
-    List<Reaction> latestReactions,
-    List<Reaction> ownReactions,
-    Message quotedMessage,
+    User? user,
+    User? pinnedBy,
+    List<Reaction>? latestReactions,
+    List<Reaction>? ownReactions,
+    Message? quotedMessage,
  }) =>
      Message(
        shadowed: shadowed,
        latestReactions: latestReactions,
        ownReactions: ownReactions,
-        attachments: attachments?.map((it) {
+        attachments: attachments.map((it) {
          final json = jsonDecode(it);
          return Attachment.fromData(json);
-        })?.toList(),
+        }).toList(),
        createdAt: createdAt,
-        extraData: extraData,
+        extraData: extraData ?? <String, Object>{},
        updatedAt: updatedAt,
        id: id,
        type: type,
@@ -48,10 +48,9 @@ extension PinnedMessageEntityX on PinnedMessageEntity {
 /// Useful mapping functions for [Message]
 extension PMessageX on Message {
  /// Maps a [Message] into [PinnedMessageEntity]
-  PinnedMessageEntity toPinnedEntity({String cid}) => PinnedMessageEntity(
+  PinnedMessageEntity toPinnedEntity({String? cid}) => PinnedMessageEntity(
        id: id,
-        attachments:
-            attachments?.map((it) => jsonEncode(it.toData()))?.toList(),
+        attachments: attachments.map((it) => jsonEncode(it.toData())).toList(),
        channelCid: cid,
        type: type,
        parentId: parentId,
@@ -63,6 +62,7 @@ extension PMessageX on Message {
        replyCount: replyCount,
        reactionScores: reactionScores,
        reactionCounts: reactionCounts,
+        mentionedUsers: mentionedUsers.map(jsonEncode).toList(),
        status: status,
        updatedAt: updatedAt,
        extraData: extraData,
@@ -4,7 +4,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 /// Useful mapping functions for [ReactionEntity]
 extension ReactionEntityX on ReactionEntity {
  /// Maps a [ReactionEntity] into [Reaction]
-  Reaction toReaction({User user}) => Reaction(
+  Reaction toReaction({User? user}) => Reaction(
        extraData: extraData,
        type: type,
        createdAt: createdAt,
@@ -22,8 +22,8 @@ extension ReactionX on Reaction {
        extraData: extraData,
        type: type,
        createdAt: createdAt,
-        userId: userId,
-        messageId: messageId,
+        userId: userId!,
+        messageId: messageId!,
        score: score,
      );
 }
@@ -4,7 +4,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 /// Useful mapping functions for [ReadEntity]
 extension ReadEntityX on ReadEntity {
  /// Maps a [ReadEntity] into [Read]
-  Read toRead({User user}) => Read(
+  Read toRead({required User user}) => Read(
        user: user,
        lastRead: lastRead,
        unreadMessages: unreadMessages,
@@ -14,9 +14,9 @@ extension ReadEntityX on ReadEntity {
 /// Useful mapping functions for [Read]
 extension ReadX on Read {
  /// Maps a [Read] into [ReadEntity]
-  ReadEntity toEntity({String cid}) => ReadEntity(
+  ReadEntity toEntity({required String cid}) => ReadEntity(
        lastRead: lastRead,
-        userId: user?.id,
+        userId: user.id,
        channelCid: cid,
        unreadMessages: unreadMessages,
      );