Skip to content

Commit d61af3b

Browse files
committed
msglist: In DmNarrow, assert in _messageVisible that message belongs
It's a bug if we load a DM-narrow message list and it has some message(s) that are outside the specified DM conversation. Some tests were running afoul of this; we fix those here.
1 parent 946a7bd commit d61af3b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/model/message_list.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
691691
return true;
692692

693693
case DmNarrow():
694+
assert((narrow as DmNarrow).containsMessage(message));
694695
return true;
695696

696697
case MentionsNarrow():

test/widgets/message_list_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,10 @@ void main() {
360360
final mutedUsers = [1, 3];
361361

362362
await setupMessageListPage(tester,
363-
narrow: DmNarrow.withOtherUsers([1, 2, 3], selfUserId: 10),
363+
narrow: DmNarrow.withOtherUsers([1, 2, 3], selfUserId: eg.selfUser.userId),
364364
users: [user1, user2, user3],
365365
mutedUserIds: mutedUsers,
366-
messageCount: 1,
366+
messages: [eg.dmMessage(from: user1, to: [user2, user3, eg.selfUser])],
367367
);
368368

369369
check(find.text('DMs with Muted user, User 2, Muted user')).findsOne();
@@ -2293,7 +2293,7 @@ void main() {
22932293
doTest(expected: false, TopicNarrow(subscription.streamId, eg.t(topic)),
22942294
mkMessage: () => eg.streamMessage(stream: subscription, topic: topic));
22952295
doTest(expected: false, DmNarrow.withUsers([], selfUserId: eg.selfUser.userId),
2296-
mkMessage: () => eg.streamMessage(stream: subscription, topic: topic));
2296+
mkMessage: () => eg.dmMessage(from: eg.selfUser, to: []));
22972297
doTest(expected: true, StarredMessagesNarrow(),
22982298
mkMessage: () => eg.streamMessage(flags: [MessageFlag.starred]));
22992299
doTest(expected: true, MentionsNarrow(),

0 commit comments

Comments
 (0)