Skip to content

Commit a5aa71f

Browse files
committed
unreads [nfc]: Remove some TODO(server-6) comments about fixed server bugs
Fixes-partly: zulip#1837
1 parent c51107e commit a5aa71f

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

lib/model/unreads.dart

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,7 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier {
533533
final topics = streams[streamId] ??= makeTopicKeyedMap();
534534
topics.update(topic,
535535
ifAbsent: () => messageIds,
536-
// setUnion dedupes existing and incoming unread IDs,
537-
// so we tolerate zulip/zulip#22164, fixed in 6.0
538-
// TODO(server-6) remove 6.0 comment
539-
(existing) => setUnion(existing, messageIds),
540-
);
536+
(existing) => setUnion(existing, messageIds));
541537
}
542538

543539
/// Remove [idsToRemove] from [streams] and [dms].
@@ -636,10 +632,6 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier {
636632
void _addAllInDm(QueueList<int> messageIds, DmNarrow dmNarrow) {
637633
dms.update(dmNarrow,
638634
ifAbsent: () => messageIds,
639-
// setUnion dedupes existing and incoming unread IDs,
640-
// so we tolerate zulip/zulip#22164, fixed in 6.0
641-
// TODO(server-6) remove 6.0 comment
642-
(existing) => setUnion(existing, messageIds),
643-
);
635+
(existing) => setUnion(existing, messageIds));
644636
}
645637
}

test/model/unreads_test.dart

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,22 +1250,6 @@ void main() {
12501250
checkMatchesMessages([message1, message2]);
12511251
});
12521252

1253-
// TODO(server-6) remove mention of zulip/zulip#22164, fixed in 6.0
1254-
test('tolerates event pointing to DM/stream messages that are already unread (zulip/zulip#22164)', () {
1255-
final message1 = eg.streamMessage(id: 1, flags: []);
1256-
final message2 = eg.dmMessage(id: 2, from: eg.otherUser, to: [eg.selfUser], flags: []);
1257-
1258-
prepare();
1259-
fillWithMessages([message1, message2]);
1260-
1261-
model.handleUpdateMessageFlagsEvent(mkEvent([message1, message2]));
1262-
checkNotifiedOnce();
1263-
1264-
message1.flags.remove(MessageFlag.read);
1265-
message2.flags.remove(MessageFlag.read);
1266-
checkMatchesMessages([message1, message2]);
1267-
});
1268-
12691253
test('tolerates "message details" missing', () {
12701254
final stream = eg.stream();
12711255
const topic = 'a';

0 commit comments

Comments
 (0)