fixed deletion off the main list and offline storage
This commit is contained in:
@@ -1663,7 +1663,11 @@ class ChannelClientState {
|
|||||||
void _listenMessageDeleted() {
|
void _listenMessageDeleted() {
|
||||||
_subscriptions.add(_channel.on(EventType.messageDeleted).listen((event) {
|
_subscriptions.add(_channel.on(EventType.messageDeleted).listen((event) {
|
||||||
final message = event.message!;
|
final message = event.message!;
|
||||||
addMessage(message);
|
if (event.hardDelete == true) {
|
||||||
|
removeMessage(message, hardDelete: true);
|
||||||
|
} else {
|
||||||
|
addMessage(message);
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1718,7 +1722,7 @@ class ChannelClientState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Remove a [message] from this [channelState].
|
/// Remove a [message] from this [channelState].
|
||||||
void removeMessage(Message message) {
|
void removeMessage(Message message, {bool hardDelete = false}) {
|
||||||
final parentId = message.parentId;
|
final parentId = message.parentId;
|
||||||
// i.e. it's a thread message
|
// i.e. it's a thread message
|
||||||
// 1. Remove the thread message
|
// 1. Remove the thread message
|
||||||
@@ -1740,7 +1744,10 @@ class ChannelClientState {
|
|||||||
} else {
|
} else {
|
||||||
// Remove regular message
|
// Remove regular message
|
||||||
final allMessages = [...messages];
|
final allMessages = [...messages];
|
||||||
if (allMessages.remove(message)) {
|
if (hardDelete) {
|
||||||
|
allMessages.removeWhere((e) => e.id == message.id);
|
||||||
|
_channelState = _channelState.copyWith(messages: allMessages);
|
||||||
|
} else if (allMessages.remove(message)) {
|
||||||
_channelState = _channelState.copyWith(messages: allMessages);
|
_channelState = _channelState.copyWith(messages: allMessages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1213,8 +1213,14 @@ class StreamChatClient {
|
|||||||
);
|
);
|
||||||
|
|
||||||
/// Deletes the given message
|
/// Deletes the given message
|
||||||
Future<EmptyResponse> deleteMessage(String messageId, {bool? hard}) =>
|
Future<EmptyResponse> deleteMessage(String messageId, {bool? hard}) async {
|
||||||
_chatApi.message.deleteMessage(messageId, hard: hard);
|
final response =
|
||||||
|
await _chatApi.message.deleteMessage(messageId, hard: hard);
|
||||||
|
if (hard == true) {
|
||||||
|
await _chatPersistenceClient?.deleteMessageById(messageId);
|
||||||
|
}
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
/// Get a message by [messageId]
|
/// Get a message by [messageId]
|
||||||
Future<GetMessageResponse> getMessage(String messageId) =>
|
Future<GetMessageResponse> getMessage(String messageId) =>
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ class Event {
|
|||||||
this.channelId,
|
this.channelId,
|
||||||
this.channelType,
|
this.channelType,
|
||||||
this.parentId,
|
this.parentId,
|
||||||
|
this.hardDelete,
|
||||||
this.extraData = const {},
|
this.extraData = const {},
|
||||||
this.isLocal = true,
|
this.isLocal = true,
|
||||||
}) : createdAt = createdAt?.toUtc() ?? DateTime.now().toUtc();
|
}) : createdAt = createdAt?.toUtc() ?? DateTime.now().toUtc();
|
||||||
@@ -91,6 +92,9 @@ class Event {
|
|||||||
@JsonKey(defaultValue: false)
|
@JsonKey(defaultValue: false)
|
||||||
final bool isLocal;
|
final bool isLocal;
|
||||||
|
|
||||||
|
/// This is true if the message has been hard deleted
|
||||||
|
final bool? hardDelete;
|
||||||
|
|
||||||
/// Map of custom channel extraData
|
/// Map of custom channel extraData
|
||||||
final Map<String, Object?> extraData;
|
final Map<String, Object?> extraData;
|
||||||
|
|
||||||
@@ -113,6 +117,7 @@ class Event {
|
|||||||
'channel_id',
|
'channel_id',
|
||||||
'channel_type',
|
'channel_type',
|
||||||
'parent_id',
|
'parent_id',
|
||||||
|
'hard_delete',
|
||||||
'is_local',
|
'is_local',
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -139,6 +144,7 @@ class Event {
|
|||||||
int? unreadChannels,
|
int? unreadChannels,
|
||||||
bool? online,
|
bool? online,
|
||||||
String? parentId,
|
String? parentId,
|
||||||
|
bool? hardDelete,
|
||||||
Map<String, Object?>? extraData,
|
Map<String, Object?>? extraData,
|
||||||
}) =>
|
}) =>
|
||||||
Event(
|
Event(
|
||||||
@@ -158,6 +164,7 @@ class Event {
|
|||||||
channelId: channelId ?? this.channelId,
|
channelId: channelId ?? this.channelId,
|
||||||
channelType: channelType ?? this.channelType,
|
channelType: channelType ?? this.channelType,
|
||||||
parentId: parentId ?? this.parentId,
|
parentId: parentId ?? this.parentId,
|
||||||
|
hardDelete: hardDelete ?? this.hardDelete,
|
||||||
extraData: extraData ?? this.extraData,
|
extraData: extraData ?? this.extraData,
|
||||||
isLocal: isLocal,
|
isLocal: isLocal,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ Event _$EventFromJson(Map<String, dynamic> json) => Event(
|
|||||||
channelId: json['channel_id'] as String?,
|
channelId: json['channel_id'] as String?,
|
||||||
channelType: json['channel_type'] as String?,
|
channelType: json['channel_type'] as String?,
|
||||||
parentId: json['parent_id'] as String?,
|
parentId: json['parent_id'] as String?,
|
||||||
|
hardDelete: json['hard_delete'] as bool?,
|
||||||
extraData: json['extra_data'] as Map<String, dynamic>? ?? const {},
|
extraData: json['extra_data'] as Map<String, dynamic>? ?? const {},
|
||||||
isLocal: json['is_local'] as bool? ?? false,
|
isLocal: json['is_local'] as bool? ?? false,
|
||||||
);
|
);
|
||||||
@@ -59,6 +60,7 @@ Map<String, dynamic> _$EventToJson(Event instance) => <String, dynamic>{
|
|||||||
'online': instance.online,
|
'online': instance.online,
|
||||||
'parent_id': instance.parentId,
|
'parent_id': instance.parentId,
|
||||||
'is_local': instance.isLocal,
|
'is_local': instance.isLocal,
|
||||||
|
'hard_delete': instance.hardDelete,
|
||||||
'extra_data': instance.extraData,
|
'extra_data': instance.extraData,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user