💄 Improve of the message notifier
This commit is contained in:
@@ -24,6 +24,8 @@ import "package:island/screens/account/profile.dart";
|
|||||||
|
|
||||||
part 'messages_notifier.g.dart';
|
part 'messages_notifier.g.dart';
|
||||||
|
|
||||||
|
const Set<String> kSilentMessageTypes = {'messages.update.links'};
|
||||||
|
|
||||||
@riverpod
|
@riverpod
|
||||||
class MessagesNotifier extends _$MessagesNotifier {
|
class MessagesNotifier extends _$MessagesNotifier {
|
||||||
late Dio _apiClient;
|
late Dio _apiClient;
|
||||||
@@ -747,6 +749,8 @@ class MessagesNotifier extends _$MessagesNotifier {
|
|||||||
|
|
||||||
talker.log('Received new message ${remoteMessage.id}');
|
talker.log('Received new message ${remoteMessage.id}');
|
||||||
|
|
||||||
|
final isSilentMessage = kSilentMessageTypes.contains(remoteMessage.type);
|
||||||
|
|
||||||
final localMessage = LocalChatMessage.fromRemoteMessage(
|
final localMessage = LocalChatMessage.fromRemoteMessage(
|
||||||
remoteMessage,
|
remoteMessage,
|
||||||
MessageStatus.sent,
|
MessageStatus.sent,
|
||||||
@@ -758,6 +762,7 @@ class MessagesNotifier extends _$MessagesNotifier {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isSilentMessage) {
|
||||||
await _database.saveMessageWithSender(localMessage);
|
await _database.saveMessageWithSender(localMessage);
|
||||||
|
|
||||||
final currentMessages = state.value ?? [];
|
final currentMessages = state.value ?? [];
|
||||||
@@ -776,6 +781,7 @@ class MessagesNotifier extends _$MessagesNotifier {
|
|||||||
_sortMessages([localMessage, ...currentMessages]),
|
_sortMessages([localMessage, ...currentMessages]),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (remoteMessage.type) {
|
switch (remoteMessage.type) {
|
||||||
case "messages.delete":
|
case "messages.delete":
|
||||||
@@ -800,7 +806,34 @@ class MessagesNotifier extends _$MessagesNotifier {
|
|||||||
talker.log('Received message update ${remoteMessage.id}');
|
talker.log('Received message update ${remoteMessage.id}');
|
||||||
|
|
||||||
final targetId = remoteMessage.meta['message_id'] ?? remoteMessage.id;
|
final targetId = remoteMessage.meta['message_id'] ?? remoteMessage.id;
|
||||||
final updatedMessage = LocalChatMessage.fromRemoteMessage(
|
|
||||||
|
LocalChatMessage updatedMessage;
|
||||||
|
|
||||||
|
if (remoteMessage.type == 'messages.update.links') {
|
||||||
|
// For link updates, merge meta with existing message instead of creating new one
|
||||||
|
final existingMessage = await fetchMessageById(targetId);
|
||||||
|
if (existingMessage == null) {
|
||||||
|
talker.log('Cannot update links for non-existent message $targetId');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final existingRemote = existingMessage.toRemoteMessage();
|
||||||
|
final mergedMeta = Map<String, dynamic>.of(existingRemote.meta);
|
||||||
|
mergedMeta.addAll(remoteMessage.meta);
|
||||||
|
mergedMeta.remove('message_id'); // Remove the target message ID from meta
|
||||||
|
|
||||||
|
final updatedRemote = existingRemote.copyWith(
|
||||||
|
meta: mergedMeta,
|
||||||
|
editedAt: remoteMessage.createdAt,
|
||||||
|
);
|
||||||
|
|
||||||
|
updatedMessage = LocalChatMessage.fromRemoteMessage(
|
||||||
|
updatedRemote,
|
||||||
|
existingMessage.status,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// For regular updates, create new message as before
|
||||||
|
updatedMessage = LocalChatMessage.fromRemoteMessage(
|
||||||
remoteMessage.copyWith(
|
remoteMessage.copyWith(
|
||||||
id: targetId,
|
id: targetId,
|
||||||
meta: Map.of(remoteMessage.meta)..remove('message_id'),
|
meta: Map.of(remoteMessage.meta)..remove('message_id'),
|
||||||
@@ -809,6 +842,8 @@ class MessagesNotifier extends _$MessagesNotifier {
|
|||||||
),
|
),
|
||||||
MessageStatus.sent,
|
MessageStatus.sent,
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
await _database.updateMessage(_database.messageToCompanion(updatedMessage));
|
await _database.updateMessage(_database.messageToCompanion(updatedMessage));
|
||||||
|
|
||||||
final currentMessages = state.value ?? [];
|
final currentMessages = state.value ?? [];
|
||||||
|
|||||||
Reference in New Issue
Block a user