Skip to content

Commit 9ab5f3b

Browse files
PIG208PIG208
committed
unreads: Handle updates when there are moved messages
We could have extend `_removeAllInStreamTopic` to fit the needs of handling moved unreads, but it is used in a code path where messages are marked as read (which will become hotter after #81). The new helper is designed to avoid making copies of message IDs when possible. As for the name, we use "pop" (inspired by Python) to indicate that the removed items are returned, since "removeAll" in Dart doesn't carry that meaning. Signed-off-by: Zixuan James Li <[email protected]>
1 parent c6d6aad commit 9ab5f3b

File tree

2 files changed

+269
-5
lines changed

2 files changed

+269
-5
lines changed

‎lib/model/unreads.dart‎

Lines changed: 83 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,8 @@ class Unreads extends ChangeNotifier {
259259
(f) => f == MessageFlag.mentioned || f == MessageFlag.wildcardMentioned,
260260
);
261261

262-
// We assume this event can't signal a change in a message's 'read' flag.
263-
// TODO can it actually though, when it's about messages being moved into an
264-
// unsubscribed stream?
265-
// https://chat.zulip.org/#narrow/stream/378-api-design/topic/mark-as-read.20events.20with.20message.20moves.3F/near/1639957
262+
// We expect the event's 'read' flag to be boring,
263+
// matching the message's local unread state.
266264
final bool isRead = event.flags.contains(MessageFlag.read);
267265
assert(() {
268266
final isUnreadLocally = isUnread(messageId);
@@ -272,6 +270,17 @@ class Unreads extends ChangeNotifier {
272270
// We were going to check something but can't; shrug.
273271
if (isUnreadLocally == null) return true;
274272

273+
final newChannelId = event.moveData?.newStreamId;
274+
if (newChannelId != null && !channelStore.subscriptions.containsKey(newChannelId)) {
275+
// When unread messages are moved to an unsubscribed channel, the server
276+
// marks them as read without sending a mark-as-read event. Clients are
277+
// asked to special-case this by marking them as read, which we do in
278+
// _handleMessageMove. That contract is clear enough and doesn't involve
279+
// this event's 'read' flag, so don't bother logging about the flag;
280+
// its behavior seems like an implementation detail that could change.
281+
return true;
282+
}
283+
275284
if (isUnreadLocally != isUnreadInEvent) {
276285
// If this happens, then either:
277286
// - the server and client have been out of sync about the message's
@@ -296,13 +305,39 @@ class Unreads extends ChangeNotifier {
296305
madeAnyUpdate |= mentions.add(messageId);
297306
}
298307

299-
// TODO(#901) handle moved messages
308+
madeAnyUpdate |= _handleMessageMove(event);
300309

301310
if (madeAnyUpdate) {
302311
notifyListeners();
303312
}
304313
}
305314

315+
bool _handleMessageMove(UpdateMessageEvent event) {
316+
if (event.moveData == null) {
317+
// No moved messages.
318+
return false;
319+
}
320+
final UpdateMessageMoveData(
321+
:origStreamId, :newStreamId, :origTopic, :newTopic) = event.moveData!;
322+
323+
final messageToMoveIds = _popAllInStreamTopic(
324+
event.messageIds.toSet(), origStreamId, origTopic)?..sort();
325+
326+
if (messageToMoveIds == null || messageToMoveIds.isEmpty) return false;
327+
assert(event.messageIds.toSet().containsAll(messageToMoveIds));
328+
329+
if (!channelStore.subscriptions.containsKey(newStreamId)) {
330+
// Unreads moved to an unsubscribed channel; just drop them.
331+
// See also:
332+
// https://chat.zulip.org/#narrow/channel/378-api-design/topic/mark-as-read.20events.20with.20message.20moves.3F/near/2101926
333+
return true;
334+
}
335+
336+
_addAllInStreamTopic(messageToMoveIds, newStreamId, newTopic);
337+
338+
return true;
339+
}
340+
306341
void handleDeleteMessageEvent(DeleteMessageEvent event) {
307342
mentions.removeAll(event.messageIds);
308343
final messageIdsSet = Set.of(event.messageIds);
@@ -506,6 +541,49 @@ class Unreads extends ChangeNotifier {
506541
}
507542
}
508543

544+
/// Remove unread stream messages contained in `incomingMessageIds`, with
545+
/// the matching `streamId` and `topic`.
546+
///
547+
/// Returns the removed message IDs, or `null` if no messages are affected.
548+
///
549+
/// Use [_removeAllInStreamTopic] if the removed message IDs are not needed.
550+
// Part of this is adapted from [ListBase.removeWhere].
551+
QueueList<int>? _popAllInStreamTopic(Set<int> incomingMessageIds, int streamId, TopicName topic) {
552+
final topics = streams[streamId];
553+
if (topics == null) return null;
554+
final messageIds = topics[topic];
555+
if (messageIds == null) return null;
556+
557+
final retainedMessageIds = messageIds.whereNot(
558+
(id) => incomingMessageIds.contains(id)).toList();
559+
560+
if (retainedMessageIds.isEmpty) {
561+
// This is an optimization for the case when all messages in the
562+
// conversation are removed, which avoids making a copy of `messageIds`
563+
// unnecessarily.
564+
topics.remove(topic);
565+
if (topics.isEmpty) {
566+
streams.remove(streamId);
567+
}
568+
return messageIds;
569+
}
570+
571+
QueueList<int>? poppedMessageIds;
572+
if (retainedMessageIds.length != messageIds.length) {
573+
poppedMessageIds = QueueList.from(
574+
messageIds.where((id) => incomingMessageIds.contains(id)));
575+
messageIds.setRange(0, retainedMessageIds.length, retainedMessageIds);
576+
messageIds.length = retainedMessageIds.length;
577+
}
578+
if (messageIds.isEmpty) {
579+
topics.remove(topic);
580+
if (topics.isEmpty) {
581+
streams.remove(streamId);
582+
}
583+
}
584+
return poppedMessageIds;
585+
}
586+
509587
// TODO use efficient model lookups
510588
bool _slowIsPresentInDms(int messageId) {
511589
return dms.values.any((ids) => ids.contains(messageId));

‎test/model/unreads_test.dart‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,192 @@ void main() {
469469
}
470470
}
471471
});
472+
473+
group('moves', () {
474+
final origChannel = eg.stream();
475+
const origTopic = 'origTopic';
476+
const newTopic = 'newTopic';
477+
478+
late List<StreamMessage> readMessages;
479+
late List<StreamMessage> unreadMessages;
480+
481+
Future<void> prepareStore() async {
482+
prepare();
483+
await channelStore.addStream(origChannel);
484+
await channelStore.addSubscription(eg.subscription(origChannel));
485+
readMessages = List<StreamMessage>.generate(10,
486+
(_) => eg.streamMessage(stream: origChannel, topic: origTopic,
487+
flags: [MessageFlag.read]));
488+
unreadMessages = List<StreamMessage>.generate(10,
489+
(_) => eg.streamMessage(stream: origChannel, topic: origTopic));
490+
}
491+
492+
List<StreamMessage> copyMessagesWith(Iterable<StreamMessage> messages, {
493+
ZulipStream? newChannel,
494+
String? newTopic,
495+
}) {
496+
assert(newChannel != null || newTopic != null);
497+
return messages.map((message) => StreamMessage.fromJson(
498+
message.toJson()
499+
..['stream_id'] = newChannel?.streamId ?? message.streamId
500+
..['subject'] = newTopic ?? message.topic
501+
)).toList();
502+
}
503+
504+
test('moving a conversation exactly', () async {
505+
await prepareStore();
506+
final newChannel = eg.stream();
507+
await channelStore.addStream(newChannel);
508+
await channelStore.addSubscription(eg.subscription(newChannel));
509+
fillWithMessages(unreadMessages);
510+
final originalMessageIds =
511+
model.streams[origChannel.streamId]![TopicName(origTopic)]!;
512+
513+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
514+
origMessages: unreadMessages,
515+
newStreamId: newChannel.streamId,
516+
newTopicStr: newTopic));
517+
checkNotifiedOnce();
518+
checkMatchesMessages(copyMessagesWith(unreadMessages,
519+
newChannel: newChannel, newTopic: newTopic));
520+
final newMessageIds =
521+
model.streams[newChannel.streamId]![TopicName(newTopic)]!;
522+
check(originalMessageIds).identicalTo(newMessageIds);
523+
});
524+
525+
test('moving some read messages from a conversation', () async {
526+
await prepareStore();
527+
final messagesToMove = readMessages.take(2).toList();
528+
fillWithMessages(unreadMessages + readMessages);
529+
530+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
531+
origMessages: messagesToMove,
532+
newTopicStr: newTopic));
533+
checkNotNotified();
534+
checkMatchesMessages(unreadMessages);
535+
});
536+
537+
test('moving some unread messages from a conversation', () async {
538+
await prepareStore();
539+
final messagesToMove = unreadMessages.take(2).toList();
540+
fillWithMessages(unreadMessages + readMessages);
541+
542+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
543+
origMessages: messagesToMove,
544+
newTopicStr: newTopic));
545+
checkNotifiedOnce();
546+
checkMatchesMessages([
547+
...copyMessagesWith(messagesToMove, newTopic: newTopic),
548+
...unreadMessages.skip(2),
549+
]);
550+
});
551+
552+
test('moving some read and unread messages from a conversation', () async {
553+
await prepareStore();
554+
final messagesToMove = [unreadMessages.first, readMessages.first];
555+
fillWithMessages(unreadMessages + readMessages);
556+
557+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
558+
origMessages: messagesToMove,
559+
newTopicStr: newTopic));
560+
checkNotifiedOnce();
561+
checkMatchesMessages([
562+
...copyMessagesWith(unreadMessages.take(1), newTopic: newTopic),
563+
...unreadMessages.skip(1),
564+
]);
565+
});
566+
567+
test('moving some read and all unread messages from a conversation', () async {
568+
await prepareStore();
569+
final messagesToMove = unreadMessages + readMessages.take(2).toList();
570+
fillWithMessages(unreadMessages + readMessages);
571+
final originalMessageIds =
572+
model.streams[origChannel.streamId]![TopicName(origTopic)]!;
573+
574+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
575+
origMessages: messagesToMove,
576+
newTopicStr: newTopic));
577+
checkNotifiedOnce();
578+
checkMatchesMessages([
579+
...copyMessagesWith(unreadMessages, newTopic: newTopic),
580+
]);
581+
final newMessageIds =
582+
model.streams[origChannel.streamId]![TopicName(newTopic)]!;
583+
check(originalMessageIds).identicalTo(newMessageIds);
584+
});
585+
586+
test('moving all read and unread messages from a conversation', () async {
587+
await prepareStore();
588+
final allMessages = unreadMessages + readMessages;
589+
fillWithMessages(allMessages);
590+
final originalMessageIds =
591+
model.streams[origChannel.streamId]![TopicName(origTopic)]!;
592+
593+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
594+
origMessages: allMessages,
595+
newTopicStr: newTopic));
596+
checkNotifiedOnce();
597+
checkMatchesMessages(copyMessagesWith(unreadMessages, newTopic: newTopic));
598+
final newMessageIds =
599+
model.streams[origChannel.streamId]![TopicName(newTopic)]!;
600+
check(originalMessageIds).identicalTo(newMessageIds);
601+
});
602+
603+
test('moving to unsubscribed channels drops the unreads', () async {
604+
await prepareStore();
605+
final unsubscribedChannel = eg.stream();
606+
await channelStore.addStream(unsubscribedChannel);
607+
assert(!channelStore.subscriptions.containsKey(
608+
unsubscribedChannel.streamId));
609+
fillWithMessages(unreadMessages);
610+
611+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
612+
origMessages: unreadMessages,
613+
newStreamId: unsubscribedChannel.streamId));
614+
checkNotifiedOnce();
615+
checkMatchesMessages([]);
616+
});
617+
618+
test('tolerates unsorted messages', () async {
619+
await prepareStore();
620+
final unreadMessages = List.generate(10, (i) =>
621+
eg.streamMessage(
622+
id: 1000 - i, stream: origChannel, topic: origTopic));
623+
fillWithMessages(unreadMessages);
624+
625+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
626+
origMessages: unreadMessages,
627+
newTopicStr: newTopic));
628+
checkNotifiedOnce();
629+
checkMatchesMessages(copyMessagesWith(unreadMessages, newTopic: newTopic));
630+
});
631+
632+
test('tolerates unreads unknown to the model', () async {
633+
await prepareStore();
634+
fillWithMessages(unreadMessages);
635+
636+
final unknownChannel = eg.stream();
637+
assert(!channelStore.streams.containsKey(unknownChannel.streamId));
638+
final unknownUnreadMessage = eg.streamMessage(
639+
stream: unknownChannel, topic: origTopic);
640+
641+
model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(
642+
origMessages: [unknownUnreadMessage],
643+
newTopicStr: newTopic));
644+
checkNotNotified();
645+
checkMatchesMessages(unreadMessages);
646+
});
647+
648+
test('message edit but no move', () async {
649+
await prepareStore();
650+
fillWithMessages(unreadMessages);
651+
652+
model.handleUpdateMessageEvent(eg.updateMessageEditEvent(
653+
unreadMessages.first));
654+
checkNotNotified();
655+
checkMatchesMessages(unreadMessages);
656+
});
657+
});
472658
});
473659

474660

0 commit comments

Comments
 (0)