Deprecated role in Member and introduced channelRole

This commit is contained in:
Ayush Shekhar
2022-05-06 17:19:45 +05:30
parent 9dab952a4c
commit bba503a6f4
13 changed files with 67 additions and 17 deletions
@@ -2007,7 +2007,7 @@ class ChannelClientState {
);
/// User role for the current user.
String? get currentUserRole => currentUserMember?.role;
String? get currentUserRole => currentUserMember?.channelRole;
/// Channel read list.
List<Read> get read => _channelState.read ?? <Read>[];
@@ -15,6 +15,7 @@ class Member extends Equatable {
this.inviteRejectedAt,
this.invited = false,
this.role,
this.channelRole,
this.userId,
this.isModerator = false,
DateTime? createdAt,
@@ -46,8 +47,12 @@ class Member extends Equatable {
final bool invited;
/// The role of the user in the channel
@Deprecated('Please use channelRole')
final String? role;
/// The role of this member in the channel
final String? channelRole;
/// The id of the interested user
final String? userId;
@@ -76,6 +81,7 @@ class Member extends Equatable {
DateTime? inviteRejectedAt,
bool? invited,
String? role,
String? channelRole,
String? userId,
bool? isModerator,
DateTime? createdAt,
@@ -93,6 +99,7 @@ class Member extends Equatable {
banExpires: banExpires ?? this.banExpires,
shadowBanned: shadowBanned ?? this.shadowBanned,
role: role ?? this.role,
channelRole: channelRole ?? this.channelRole,
userId: userId ?? this.userId,
isModerator: isModerator ?? this.isModerator,
createdAt: createdAt ?? this.createdAt,
@@ -109,6 +116,7 @@ class Member extends Equatable {
inviteRejectedAt,
invited,
role,
channelRole,
userId,
isModerator,
banned,
@@ -18,6 +18,7 @@ Member _$MemberFromJson(Map<String, dynamic> json) => Member(
: DateTime.parse(json['invite_rejected_at'] as String),
invited: json['invited'] as bool? ?? false,
role: json['role'] as String?,
channelRole: json['channel_role'] as String?,
userId: json['user_id'] as String?,
isModerator: json['is_moderator'] as bool? ?? false,
createdAt: json['created_at'] == null
@@ -39,6 +40,7 @@ Map<String, dynamic> _$MemberToJson(Member instance) => <String, dynamic>{
'invite_rejected_at': instance.inviteRejectedAt?.toIso8601String(),
'invited': instance.invited,
'role': instance.role,
'channel_role': instance.channelRole,
'user_id': instance.userId,
'is_moderator': instance.isModerator,
'banned': instance.banned,
+1 -1
View File
@@ -9,7 +9,7 @@
"name": "Robin Papa",
"image": "https://pbs.twimg.com/profile_images/669512187778498560/L7wQctBt.jpg"
},
"role": "member",
"channel_role": "channel_member",
"created_at": "2020-01-28T22:17:30.95443Z",
"updated_at": "2020-01-28T22:17:30.95443Z"
}
@@ -9,7 +9,7 @@ void main() {
test('should parse json correctly', () {
final member = Member.fromJson(jsonFixture('member.json'));
expect(member.user, isA<User>());
expect(member.role, 'member');
expect(member.channelRole, 'channel_member');
expect(member.createdAt, DateTime.parse('2020-01-28T22:17:30.95443Z'));
expect(member.updatedAt, DateTime.parse('2020-01-28T22:17:30.95443Z'));
});