merge origin/develop into ref/segregate-api-layer

Signed-off-by: Sahil Kumar <[email protected]>

packages/stream_chat/lib/src/core/api/channel_api.dart

@@ -109,12 +109,16 @@ class ChannelApi {
   /// Updates the [channelId] of type [ChannelType] data with [data]
   Future<PartialUpdateChannelResponse> updateChannelPartial(
     String channelId,
-    String channelType,
-    Map<String, dynamic> data,
-  ) async {
+    String channelType, {
+    Map<String, Object?>? set,
+    List<String>? unset,
+  }) async {
     final response = await _client.patch(
       _getChannelUrl(channelId, channelType),
-      data: data,
+      data: {
+        if (set != null) 'set': set,
+        if (unset != null) 'unset': unset,
+      },
     );
     return PartialUpdateChannelResponse.fromJson(response.data);
   }

packages/stream_chat/lib/src/core/api/message_api.dart

@@ -14,11 +14,15 @@ class MessageApi {
   Future<SendMessageResponse> sendMessage(
     String channelId,
     String channelType,
-    Message message,
-  ) async {
+    Message message, {
+    bool skipPush = false,
+  }) async {
     final response = await _client.post(
       '/channels/$channelType/$channelId/message',
-      data: {'message': message},
+      data: {
+        'message': message,
+        'skip_push': skipPush,
+      },
     );
     return SendMessageResponse.fromJson(response.data);
   }
@@ -56,6 +60,24 @@ class MessageApi {
     return UpdateMessageResponse.fromJson(response.data);
   }
 
+  /// Partially update the given [messageId]
+  /// Use [set] to define values to be set
+  /// Use [unset] to define values to be unset
+  Future<UpdateMessageResponse> partialUpdateMessage(
+    String messageId, {
+    Map<String, Object?>? set,
+    List<String>? unset,
+  }) async {
+    final response = await _client.put(
+      '/messages/$messageId',
+      data: {
+        if (set != null) 'set': set,
+        if (unset != null) 'unset': unset,
+      },
+    );
+    return UpdateMessageResponse.fromJson(response.data);
+  }
+
   /// Deletes the given [messageId]
   Future<EmptyResponse> deleteMessage(
     String messageId,

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

@@ -1,3 +1,4 @@
+import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stream_chat/src/core/models/user.dart';
 
@@ -6,7 +7,7 @@ part 'member.g.dart';
 /// The class that contains the information about the user membership
 /// in a channel
 @JsonSerializable()
-class Member {
+class Member extends Equatable {
   /// Constructor used for json serialization
   Member({
     this.user,
@@ -98,4 +99,19 @@ class Member {
 
   /// Serialize to json
   Map<String, dynamic> toJson() => _$MemberToJson(this);
+
+  @override
+  List<Object?> get props => [
+        user,
+        inviteAcceptedAt,
+        inviteRejectedAt,
+        invited,
+        role,
+        userId,
+        isModerator,
+        banned,
+        shadowBanned,
+        createdAt,
+        updatedAt,
+      ];
 }

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

@@ -73,7 +73,6 @@ class Message extends Equatable {
     this.extraData = const {},
     this.deletedAt,
     this.status = MessageSendingStatus.sent,
-    this.skipPush = false,
   })  : id = id ?? const Uuid().v4(),
         pinExpires = pinExpires?.toUtc(),
         createdAt = createdAt ?? DateTime.now(),
@@ -158,10 +157,6 @@ class Message extends Equatable {
   @JsonKey(defaultValue: false)
   final bool silent;
 
-  /// If true the message will not send a push notification
-  @JsonKey(defaultValue: false)
-  final bool skipPush;
-
   /// If true the message is shadowed
   @JsonKey(
     includeIfNull: false,
@@ -253,7 +248,6 @@ class Message extends Equatable {
     'pinned_at',
     'pin_expires',
     'pinned_by',
-    'skip_push',
   ];
 
   /// Serialize to json
@@ -291,7 +285,6 @@ class Message extends Equatable {
     User? pinnedBy,
     Map<String, Object?>? extraData,
     MessageSendingStatus? status,
-    bool? skipPush,
   }) {
     assert(() {
       if (pinExpires is! DateTime &&
@@ -331,7 +324,6 @@ class Message extends Equatable {
       pinnedBy: pinnedBy ?? this.pinnedBy,
       pinExpires:
           pinExpires == _pinExpires ? this.pinExpires : pinExpires as DateTime?,
-      skipPush: skipPush ?? this.skipPush,
     );
   }
 
@@ -398,7 +390,6 @@ class Message extends Equatable {
         pinnedBy,
         extraData,
         status,
-        skipPush,
       ];
 }
 

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

@@ -67,7 +67,6 @@ Message _$MessageFromJson(Map<String, dynamic> json) {
     deletedAt: json['deleted_at'] == null
         ? null
         : DateTime.parse(json['deleted_at'] as String),
-    skipPush: json['skip_push'] as bool? ?? false,
   );
 }
 
@@ -97,7 +96,6 @@ Map<String, dynamic> _$MessageToJson(Message instance) {
   writeNotNull('thread_participants', readonly(instance.threadParticipants));
   val['show_in_channel'] = instance.showInChannel;
   val['silent'] = instance.silent;
-  val['skip_push'] = instance.skipPush;
   writeNotNull('shadowed', readonly(instance.shadowed));
   writeNotNull('command', readonly(instance.command));
   writeNotNull('created_at', readonly(instance.createdAt));

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

@@ -1,3 +1,4 @@
+import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stream_chat/src/core/util/serializer.dart';
 
@@ -5,7 +6,7 @@ part 'user.g.dart';
 
 /// The class that defines the user model
 @JsonSerializable()
-class User {
+class User extends Equatable {
   /// Constructor used for json serialization
   User({
     required this.id,
@@ -129,4 +130,17 @@ class User {
         banned: banned ?? this.banned,
         teams: teams ?? this.teams,
       );
+
+  @override
+  List<Object?> get props => [
+        id,
+        role,
+        teams,
+        createdAt,
+        updatedAt,
+        lastActive,
+        online,
+        banned,
+        extraData,
+      ];
 }