Merge branch 'develop' into cds-189

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

@@ -75,7 +75,7 @@ class QueryChannelsResponse extends _BaseResponse {
 @JsonSerializable(createToJson: false)
 class TranslateMessageResponse extends _BaseResponse {
   /// Translated message
-  late TranslatedMessage message;
+  late Message message;
 
   /// Create a new instance from a json
   static TranslateMessageResponse fromJson(Map<String, dynamic> json) =>

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

@@ -47,8 +47,7 @@ TranslateMessageResponse _$TranslateMessageResponseFromJson(
     Map<String, dynamic> json) {
   return TranslateMessageResponse()
     ..duration = json['duration'] as String?
-    ..message =
-        TranslatedMessage.fromJson(json['message'] as Map<String, dynamic>);
+    ..message = Message.fromJson(json['message'] as Map<String, dynamic>);
 }
 
 QueryMembersResponse _$QueryMembersResponseFromJson(Map<String, dynamic> json) {

packages/stream_chat/lib/src/core/http/stream_http_client.dart

@@ -10,9 +10,7 @@ import 'package:stream_chat/src/core/http/interceptor/connection_id_interceptor.
 import 'package:stream_chat/src/core/http/interceptor/logging_interceptor.dart';
 import 'package:stream_chat/src/core/http/stream_chat_dio_error.dart';
 import 'package:stream_chat/src/core/http/token_manager.dart';
-import 'package:stream_chat/src/core/platform_detector/platform_detector.dart';
 import 'package:stream_chat/src/location.dart';
-import 'package:stream_chat/version.dart';
 
 part 'stream_http_client_options.dart';
 
@@ -33,11 +31,14 @@ class StreamHttpClient {
       ..options.baseUrl = _options.baseUrl
       ..options.receiveTimeout = _options.receiveTimeout.inMilliseconds
       ..options.connectTimeout = _options.connectTimeout.inMilliseconds
-      ..options.queryParameters = {'api_key': apiKey}
+      ..options.queryParameters = {
+        'api_key': apiKey,
+        ..._options.queryParameters,
+      }
       ..options.headers = {
         'Content-Type': 'application/json',
-        'X-Stream-Client': _options.userAgent,
         'Content-Encoding': 'application/gzip',
+        ..._options.headers,
       }
       ..interceptors.addAll([
         if (tokenManager != null) AuthInterceptor(this, tokenManager),

packages/stream_chat/lib/src/core/http/stream_http_client_options.dart

@@ -10,6 +10,8 @@ class StreamHttpClientOptions {
     this.location,
     this.connectTimeout = const Duration(seconds: 6),
     this.receiveTimeout = const Duration(seconds: 6),
+    this.queryParameters = const {},
+    this.headers = const {},
   }) : _baseUrl = baseUrl ?? _defaultBaseURL;
 
   final String _baseUrl;
@@ -32,8 +34,20 @@ class StreamHttpClientOptions {
   /// received timeout, default to 6s
   final Duration receiveTimeout;
 
-  /// Get the current user agent
-  String get userAgent => 'stream-chat-dart-client-'
-      '${CurrentPlatform.name}-'
-      '${PACKAGE_VERSION.split('+')[0]}';
+  /// Common query parameters.
+  ///
+  /// List values use the default [ListFormat.multiCompatible].
+  ///
+  /// The value can be overridden per parameter by adding a [MultiParam]
+  /// object wrapping the actual List value and the desired format.
+  final Map<String, Object?> queryParameters;
+
+  /// Http request headers.
+  /// The keys of initial headers will be converted to lowercase,
+  /// for example 'Content-Type' will be converted to 'content-type'.
+  ///
+  /// The key of Header Map is case-insensitive
+  /// eg: content-type and Content-Type are
+  /// regard as the same key.
+  final Map<String, Object?> headers;
 }

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

@@ -2,8 +2,8 @@ import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stream_chat/src/core/models/attachment.dart';
 import 'package:stream_chat/src/core/models/reaction.dart';
-import 'package:stream_chat/src/core/util/serializer.dart';
 import 'package:stream_chat/src/core/models/user.dart';
+import 'package:stream_chat/src/core/util/serializer.dart';
 import 'package:uuid/uuid.dart';
 
 part 'message.g.dart';
@@ -73,6 +73,7 @@ class Message extends Equatable {
     this.extraData = const {},
     this.deletedAt,
     this.status = MessageSendingStatus.sent,
+    this.i18n,
   })  : id = id ?? const Uuid().v4(),
         pinExpires = pinExpires?.toUtc(),
         createdAt = createdAt ?? DateTime.now(),
@@ -218,6 +219,10 @@ class Message extends Equatable {
   @JsonKey(includeIfNull: false, toJson: Serializer.readOnly)
   final DateTime? deletedAt;
 
+  /// A Map of translations.
+  @JsonKey(includeIfNull: false)
+  final Map<String, String>? i18n;
+
   /// Known top level fields.
   /// Useful for [Serializer] methods.
   static const topLevelFields = [
@@ -248,6 +253,7 @@ class Message extends Equatable {
     'pinned_at',
     'pin_expires',
     'pinned_by',
+    'i18n',
   ];
 
   /// Serialize to json
@@ -285,6 +291,7 @@ class Message extends Equatable {
     User? pinnedBy,
     Map<String, Object?>? extraData,
     MessageSendingStatus? status,
+    Map<String, String>? i18n,
   }) {
     assert(() {
       if (pinExpires is! DateTime &&
@@ -324,6 +331,7 @@ class Message extends Equatable {
       pinnedBy: pinnedBy ?? this.pinnedBy,
       pinExpires:
           pinExpires == _pinExpires ? this.pinExpires : pinExpires as DateTime?,
+      i18n: i18n ?? this.i18n,
     );
   }
 
@@ -358,6 +366,7 @@ class Message extends Equatable {
         pinnedAt: other.pinnedAt,
         pinExpires: other.pinExpires,
         pinnedBy: other.pinnedBy,
+        i18n: other.i18n,
       );
 
   @override
@@ -390,35 +399,6 @@ class Message extends Equatable {
         pinnedBy,
         extraData,
         status,
+        i18n,
       ];
 }
-
-/// A translated message
-/// It has an additional property called [i18n]
-@JsonSerializable()
-class TranslatedMessage extends Message {
-  /// Constructor used for json serialization
-  TranslatedMessage(this.i18n) : super();
-
-  /// Create a new instance from a json
-  factory TranslatedMessage.fromJson(Map<String, dynamic> json) =>
-      _$TranslatedMessageFromJson(
-        Serializer.moveToExtraDataFromRoot(json, topLevelFields),
-      );
-
-  /// A Map of
-  final Map<String, String>? i18n;
-
-  /// Known top level fields.
-  /// Useful for [Serializer] methods.
-  static final topLevelFields = [
-    'i18n',
-    ...Message.topLevelFields,
-  ];
-
-  /// Serialize to json
-  @override
-  Map<String, dynamic> toJson() => Serializer.moveFromExtraDataToRoot(
-        _$TranslatedMessageToJson(this),
-      );
-}

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

@@ -67,6 +67,9 @@ Message _$MessageFromJson(Map<String, dynamic> json) {
     deletedAt: json['deleted_at'] == null
         ? null
         : DateTime.parse(json['deleted_at'] as String),
+    i18n: (json['i18n'] as Map<String, dynamic>?)?.map(
+      (k, e) => MapEntry(k, e as String),
+    ),
   );
 }
 
@@ -107,18 +110,6 @@ Map<String, dynamic> _$MessageToJson(Message instance) {
   val['pinned_by'] = readonly(instance.pinnedBy);
   val['extra_data'] = instance.extraData;
   writeNotNull('deleted_at', readonly(instance.deletedAt));
+  writeNotNull('i18n', instance.i18n);
   return val;
 }
-
-TranslatedMessage _$TranslatedMessageFromJson(Map<String, dynamic> json) {
-  return TranslatedMessage(
-    (json['i18n'] as Map<String, dynamic>?)?.map(
-      (k, e) => MapEntry(k, e as String),
-    ),
-  );
-}
-
-Map<String, dynamic> _$TranslatedMessageToJson(TranslatedMessage instance) =>
-    <String, dynamic>{
-      'i18n': instance.i18n,
-    };

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

@@ -27,6 +27,7 @@ class OwnUser extends User {
     Map<String, Object?> extraData = const {},
     bool banned = false,
     List<String> teams = const [],
+    String? language,
   }) : super(
           id: id,
           role: role,
@@ -37,6 +38,7 @@ class OwnUser extends User {
           extraData: extraData,
           banned: banned,
           teams: teams,
+          language: language,
         );
 
   /// Create a new instance from a json
@@ -54,6 +56,7 @@ class OwnUser extends User {
         banned: user.banned,
         extraData: user.extraData,
         teams: user.teams,
+        language: user.language,
       );
 
   /// Creates a copy of [OwnUser] with specified attributes overridden.
@@ -73,6 +76,7 @@ class OwnUser extends User {
     List<Mute>? mutes,
     int? totalUnreadCount,
     int? unreadChannels,
+    String? language,
   }) =>
       OwnUser(
         id: id ?? this.id,
@@ -89,15 +93,13 @@ class OwnUser extends User {
         mutes: mutes ?? this.mutes,
         totalUnreadCount: totalUnreadCount ?? this.totalUnreadCount,
         unreadChannels: unreadChannels ?? this.unreadChannels,
+        language: language ?? this.language,
       );
 
   /// Returns a new [OwnUser] that is a combination of this ownUser
   /// and the given [other] ownUser.
   OwnUser merge(OwnUser? other) {
-    if (other == null) {
-      return this;
-    }
-
+    if (other == null) return this;
     return copyWith(
       banned: other.banned,
       channelMutes: other.channelMutes,
@@ -113,6 +115,7 @@ class OwnUser extends User {
       totalUnreadCount: other.totalUnreadCount,
       unreadChannels: other.unreadChannels,
       updatedAt: other.updatedAt,
+      language: other.language,
     );
   }
 

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

@@ -39,5 +39,6 @@ OwnUser _$OwnUserFromJson(Map<String, dynamic> json) {
     teams:
         (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ??
             [],
+    language: json['language'] as String?,
   );
 }

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

@@ -18,6 +18,7 @@ class User extends Equatable {
     this.extraData = const {},
     this.banned = false,
     this.teams = const [],
+    this.language,
   })  : createdAt = createdAt ?? DateTime.now(),
         updatedAt = updatedAt ?? DateTime.now();
 
@@ -36,6 +37,7 @@ class User extends Equatable {
     'online',
     'banned',
     'teams',
+    'language',
   ];
 
   /// User id
@@ -82,8 +84,11 @@ class User extends Equatable {
   )
   final Map<String, Object?> extraData;
 
-  @override
-  int get hashCode => id.hashCode;
+  /// The language this user prefers.
+  ///
+  /// Defaults to 'en'.
+  @JsonKey(includeIfNull: false)
+  final String? language;
 
   /// Shortcut for user name
   String get name {
@@ -98,11 +103,6 @@ class User extends Equatable {
   static List<String>? toIds(List<User>? users) =>
       users?.map((u) => u.id).toList();
 
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is User && runtimeType == other.runtimeType && id == other.id;
-
   /// Serialize to json
   Map<String, dynamic> toJson() => Serializer.moveFromExtraDataToRoot(
         _$UserToJson(this),
@@ -119,6 +119,7 @@ class User extends Equatable {
     Map<String, Object?>? extraData,
     bool? banned,
     List<String>? teams,
+    String? language,
   }) =>
       User(
         id: id ?? this.id,
@@ -130,18 +131,9 @@ class User extends Equatable {
         extraData: extraData ?? this.extraData,
         banned: banned ?? this.banned,
         teams: teams ?? this.teams,
+        language: language ?? this.language,
       );
 
   @override
-  List<Object?> get props => [
-        id,
-        role,
-        teams,
-        createdAt,
-        updatedAt,
-        lastActive,
-        online,
-        banned,
-        extraData,
-      ];
+  List<Object?> get props => [id];
 }

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

@@ -25,6 +25,7 @@ User _$UserFromJson(Map<String, dynamic> json) {
     teams:
         (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ??
             [],
+    language: json['language'] as String?,
   );
 }
 
@@ -47,5 +48,6 @@ Map<String, dynamic> _$UserToJson(User instance) {
   writeNotNull('online', readonly(instance.online));
   writeNotNull('banned', readonly(instance.banned));
   val['extra_data'] = instance.extraData;
+  writeNotNull('language', instance.language);
   return val;
 }