Skip to content

Commit 844d1cf

Browse files
committed
msglist [nfc]: Rename MessageListView.maybeAddMessage to handleMessageEvent
1 parent 8bb69b4 commit 844d1cf

File tree

3 files changed

+40
-28
lines changed

3 files changed

+40
-28
lines changed

lib/model/message.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MessageStoreImpl with MessageStore {
3838

3939
void handleMessageEvent(MessageEvent event) {
4040
for (final view in _messageListViews) {
41-
view.maybeAddMessage(event.message);
41+
view.handleMessageEvent(event);
4242
}
4343
}
4444

lib/model/message_list.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,9 @@ class MessageListView with ChangeNotifier, _MessageSequence {
426426
}
427427
}
428428

429-
/// Add [message] to this view, if it belongs here.
430-
///
431-
/// Called in particular when we get a [MessageEvent].
432-
void maybeAddMessage(Message message) {
429+
/// Add [MessageEvent.message] to this view, if it belongs here.
430+
void handleMessageEvent(MessageEvent event) {
431+
final message = event.message;
433432
if (!narrow.containsMessage(message) || !_messageVisible(message)) {
434433
return;
435434
}

test/model/message_list_test.dart

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -234,35 +234,38 @@ void main() {
234234
..messages.length.equals(200);
235235
});
236236

237-
test('maybeAddMessage', () async {
237+
test('handleMessageEvent', () async {
238238
final stream = eg.stream();
239239
await prepare(narrow: StreamNarrow(stream.streamId));
240240
await prepareMessages(foundOldest: true, messages:
241241
List.generate(30, (i) => eg.streamMessage(stream: stream)));
242242

243243
check(model).messages.length.equals(30);
244-
model.maybeAddMessage(eg.streamMessage(stream: stream));
244+
model.handleMessageEvent(MessageEvent(id: 0,
245+
message: eg.streamMessage(stream: stream)));
245246
checkNotifiedOnce();
246247
check(model).messages.length.equals(31);
247248
});
248249

249-
test('maybeAddMessage, not in narrow', () async {
250+
test('handleMessageEvent, not in narrow', () async {
250251
final stream = eg.stream(streamId: 123);
251252
await prepare(narrow: StreamNarrow(stream.streamId));
252253
await prepareMessages(foundOldest: true, messages:
253254
List.generate(30, (i) => eg.streamMessage(stream: stream)));
254255

255256
check(model).messages.length.equals(30);
256257
final otherStream = eg.stream(streamId: 234);
257-
model.maybeAddMessage(eg.streamMessage(stream: otherStream));
258+
model.handleMessageEvent(MessageEvent(id: 0,
259+
message: eg.streamMessage(stream: otherStream)));
258260
checkNotNotified();
259261
check(model).messages.length.equals(30);
260262
});
261263

262-
test('maybeAddMessage, before fetch', () async {
264+
test('handleMessageEvent, before fetch', () async {
263265
final stream = eg.stream();
264266
await prepare(narrow: StreamNarrow(stream.streamId));
265-
model.maybeAddMessage(eg.streamMessage(stream: stream));
267+
model.handleMessageEvent(MessageEvent(id: 0,
268+
message: eg.streamMessage(stream: stream)));
266269
checkNotNotified();
267270
check(model).fetched.isFalse();
268271
checkInvariants(model);
@@ -537,7 +540,8 @@ void main() {
537540
await prepare(narrow: StreamNarrow(stream.streamId));
538541
await prepareMessages(foundOldest: true, messages:
539542
List.generate(30, (i) => eg.streamMessage(stream: stream)));
540-
model.maybeAddMessage(eg.streamMessage(stream: stream));
543+
model.handleMessageEvent(MessageEvent(id: 0,
544+
message: eg.streamMessage(stream: stream)));
541545
checkNotifiedOnce();
542546
check(model).messages.length.equals(31);
543547

@@ -592,24 +596,29 @@ void main() {
592596
check(model.messages.map((m) => m.id))
593597
.deepEquals(expected..insertAll(0, [101, 103, 105]));
594598

595-
// … and on maybeAddMessage.
596-
model.maybeAddMessage(eg.streamMessage(id: 301, stream: stream1, topic: 'A'));
599+
// … and on handleMessageEvent.
600+
model.handleMessageEvent(MessageEvent(id: 0,
601+
message: eg.streamMessage(id: 301, stream: stream1, topic: 'A')));
597602
checkNotifiedOnce();
598603
check(model.messages.map((m) => m.id)).deepEquals(expected..add(301));
599604

600-
model.maybeAddMessage(eg.streamMessage(id: 302, stream: stream1, topic: 'B'));
605+
model.handleMessageEvent(MessageEvent(id: 0,
606+
message: eg.streamMessage(id: 302, stream: stream1, topic: 'B')));
601607
checkNotNotified();
602608
check(model.messages.map((m) => m.id)).deepEquals(expected);
603609

604-
model.maybeAddMessage(eg.streamMessage(id: 303, stream: stream2, topic: 'C'));
610+
model.handleMessageEvent(MessageEvent(id: 0,
611+
message: eg.streamMessage(id: 303, stream: stream2, topic: 'C')));
605612
checkNotifiedOnce();
606613
check(model.messages.map((m) => m.id)).deepEquals(expected..add(303));
607614

608-
model.maybeAddMessage(eg.streamMessage(id: 304, stream: stream2, topic: 'D'));
615+
model.handleMessageEvent(MessageEvent(id: 0,
616+
message: eg.streamMessage(id: 304, stream: stream2, topic: 'D')));
609617
checkNotNotified();
610618
check(model.messages.map((m) => m.id)).deepEquals(expected);
611619

612-
model.maybeAddMessage(eg.dmMessage(id: 305, from: eg.otherUser, to: [eg.selfUser]));
620+
model.handleMessageEvent(MessageEvent(id: 0,
621+
message: eg.dmMessage(id: 305, from: eg.otherUser, to: [eg.selfUser])));
613622
checkNotifiedOnce();
614623
check(model.messages.map((m) => m.id)).deepEquals(expected..add(305));
615624
});
@@ -644,16 +653,19 @@ void main() {
644653
check(model.messages.map((m) => m.id))
645654
.deepEquals(expected..insertAll(0, [101, 102]));
646655

647-
// … and on maybeAddMessage.
648-
model.maybeAddMessage(eg.streamMessage(id: 301, stream: stream, topic: 'A'));
656+
// … and on handleMessageEvent.
657+
model.handleMessageEvent(MessageEvent(id: 0,
658+
message: eg.streamMessage(id: 301, stream: stream, topic: 'A')));
649659
checkNotifiedOnce();
650660
check(model.messages.map((m) => m.id)).deepEquals(expected..add(301));
651661

652-
model.maybeAddMessage(eg.streamMessage(id: 302, stream: stream, topic: 'B'));
662+
model.handleMessageEvent(MessageEvent(id: 0,
663+
message: eg.streamMessage(id: 302, stream: stream, topic: 'B')));
653664
checkNotifiedOnce();
654665
check(model.messages.map((m) => m.id)).deepEquals(expected..add(302));
655666

656-
model.maybeAddMessage(eg.streamMessage(id: 303, stream: stream, topic: 'C'));
667+
model.handleMessageEvent(MessageEvent(id: 0,
668+
message: eg.streamMessage(id: 303, stream: stream, topic: 'C')));
657669
checkNotNotified();
658670
check(model.messages.map((m) => m.id)).deepEquals(expected);
659671
});
@@ -683,8 +695,9 @@ void main() {
683695
check(model.messages.map((m) => m.id))
684696
.deepEquals(expected..insertAll(0, [101]));
685697

686-
// … and on maybeAddMessage.
687-
model.maybeAddMessage(eg.streamMessage(id: 301, stream: stream, topic: 'A'));
698+
// … and on handleMessageEvent.
699+
model.handleMessageEvent(MessageEvent(id: 0,
700+
message: eg.streamMessage(id: 301, stream: stream, topic: 'A')));
688701
checkNotifiedOnce();
689702
check(model.messages.map((m) => m.id)).deepEquals(expected..add(301));
690703
});
@@ -737,12 +750,12 @@ void main() {
737750
await model.fetchOlder();
738751
checkNotified(count: 2);
739752

740-
// Then test maybeAddMessage, where a new header is needed…
741-
model.maybeAddMessage(streamMessage(13));
753+
// Then test handleMessageEvent, where a new header is needed…
754+
model.handleMessageEvent(MessageEvent(id: 0, message: streamMessage(13)));
742755
checkNotifiedOnce();
743756

744757
// … and where it's not.
745-
model.maybeAddMessage(streamMessage(14));
758+
model.handleMessageEvent(MessageEvent(id: 0, message: streamMessage(14)));
746759
checkNotifiedOnce();
747760

748761
// Then test maybeUpdateMessage, where a header is and remains needed…
@@ -781,7 +794,7 @@ void main() {
781794
// Until then, we always compute this sequentially from oldest to newest.
782795
// So we just need to exercise the different cases of the logic for
783796
// whether the sender should be shown, but the difference between
784-
// fetchInitial and maybeAddMessage etc. doesn't matter.
797+
// fetchInitial and handleMessageEvent etc. doesn't matter.
785798

786799
const t1 = 1693602618;
787800
const t2 = t1 + 86400;

0 commit comments

Comments
 (0)