Skip to content

Commit 8d8841e

Browse files
PIG208PIG208
committed
narrow: Add starred messages narrow.
"Starred messages narrow" is the user facing name of the narrow, thus we name the Narrow class after it. This narrow is pretty similar to MentionsNarrow. Signed-off-by: Zixuan James Li <[email protected]>
1 parent 409468b commit 8d8841e

17 files changed

+144
-8
lines changed

‎assets/l10n/app_en.arb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,10 @@
499499
"@mentionsPageTitle": {
500500
"description": "Title for the page of @-mentions."
501501
},
502+
"starredMessagesPageTitle": "Starred messages",
503+
"@starredMessagesPageTitle": {
504+
"description": "Title for the page of starred messages."
505+
},
502506
"notifGroupDmConversationLabel": "{senderFullName} to you and {numOthers, plural, =1{1 other} other{{numOthers} others}}",
503507
"@notifGroupDmConversationLabel": {
504508
"description": "Label for a group DM conversation notification.",

‎lib/model/autocomplete.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
319319
break;
320320
case CombinedFeedNarrow():
321321
case MentionsNarrow():
322+
case StarredMessagesNarrow():
322323
assert(false, 'No compose box, thus no autocomplete is available in ${narrow.runtimeType}.');
323324
}
324325
return (userA, userB) => _compareByRelevance(userA, userB,

‎lib/model/message.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,12 @@ class MessageStoreImpl with MessageStore {
271271
for (final view in _messageListViews) {
272272
view.notifyListenersIfAnyMessagePresent(event.messages);
273273
// TODO(#818): Support MentionsNarrow live-updates when handling @-mentioned flags.
274+
275+
// To make it easier to re-star a message, we opt-out from supporting
276+
// live-updates when starred flag is removed.
277+
//
278+
// TODO: Support StarredMessagesNarrow live-updates when starred flag
279+
// is added.
274280
}
275281
}
276282
}

‎lib/model/message_list.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
418418
case TopicNarrow():
419419
case DmNarrow():
420420
case MentionsNarrow():
421+
case StarredMessagesNarrow():
421422
return true;
422423
}
423424
}
@@ -436,6 +437,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
436437
case TopicNarrow():
437438
case DmNarrow():
438439
case MentionsNarrow():
440+
case StarredMessagesNarrow():
439441
return VisibilityEffect.none;
440442
}
441443
}
@@ -452,6 +454,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
452454
case TopicNarrow():
453455
case DmNarrow():
454456
case MentionsNarrow():
457+
case StarredMessagesNarrow():
455458
return true;
456459
}
457460
}
@@ -638,6 +641,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
638641

639642
case CombinedFeedNarrow():
640643
case MentionsNarrow():
644+
case StarredMessagesNarrow():
641645
// The messages were and remain in this narrow.
642646
// TODO(#421): … except they may have become muted or not.
643647
// We'll handle that at the same time as we handle muting itself changing.

‎lib/model/narrow.dart

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,3 +321,25 @@ class MentionsNarrow extends Narrow {
321321
@override
322322
int get hashCode => 'MentionsNarrow'.hashCode;
323323
}
324+
325+
class StarredMessagesNarrow extends Narrow {
326+
const StarredMessagesNarrow();
327+
328+
@override
329+
ApiNarrow apiEncode() => [ApiNarrowIs(IsOperand.starred)];
330+
331+
@override
332+
bool containsMessage(Message message) {
333+
return message.flags.contains(MessageFlag.starred);
334+
}
335+
336+
@override
337+
bool operator ==(Object other) {
338+
if (other is! StarredMessagesNarrow) return false;
339+
// Conceptually there's only one value of this type.
340+
return true;
341+
}
342+
343+
@override
344+
int get hashCode => 'StarredMessagesNarrow'.hashCode;
345+
}

‎lib/model/unreads.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ class Unreads extends ChangeNotifier {
195195

196196
int countInMentionsNarrow() => mentions.length;
197197

198+
// TODO: Implement unreads handling.
199+
int countInStarredMessagesNarrow() => 0;
200+
198201
int countInNarrow(Narrow narrow) {
199202
switch (narrow) {
200203
case CombinedFeedNarrow():
@@ -207,6 +210,8 @@ class Unreads extends ChangeNotifier {
207210
return countInDmNarrow(narrow);
208211
case MentionsNarrow():
209212
return countInMentionsNarrow();
213+
case StarredMessagesNarrow():
214+
return countInStarredMessagesNarrow();
210215
}
211216
}
212217

‎lib/widgets/actions.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,8 @@ Future<void> _legacyMarkNarrowAsRead(BuildContext context, Narrow narrow) async
214214
messages: unreadMentions,
215215
op: UpdateMessageFlagsOp.add,
216216
flag: MessageFlag.read);
217+
case StarredMessagesNarrow():
218+
// TODO: Implement unreads handling.
219+
return;
217220
}
218221
}

‎lib/widgets/compose_box.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,6 +1123,7 @@ class ComposeBox extends StatelessWidget {
11231123

11241124
case CombinedFeedNarrow():
11251125
case MentionsNarrow():
1126+
case StarredMessagesNarrow():
11261127
return false;
11271128
}
11281129
}
@@ -1139,6 +1140,7 @@ class ComposeBox extends StatelessWidget {
11391140
return _FixedDestinationComposeBox(key: controllerKey, narrow: narrow);
11401141
case CombinedFeedNarrow():
11411142
case MentionsNarrow():
1143+
case StarredMessagesNarrow():
11421144
return const SizedBox.shrink();
11431145
}
11441146
}

‎lib/widgets/message_list.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ class _MessageListPageState extends State<MessageListPage> implements MessageLis
248248
switch(narrow) {
249249
case CombinedFeedNarrow():
250250
case MentionsNarrow():
251+
case StarredMessagesNarrow():
251252
appBarBackgroundColor = null; // i.e., inherit
252253

253254
case ChannelNarrow(:final streamId):
@@ -337,6 +338,9 @@ class MessageListAppBarTitle extends StatelessWidget {
337338
case MentionsNarrow():
338339
return Text(zulipLocalizations.mentionsPageTitle);
339340

341+
case StarredMessagesNarrow():
342+
return Text(zulipLocalizations.starredMessagesPageTitle);
343+
340344
case ChannelNarrow(:var streamId):
341345
final store = PerAccountStoreWidget.of(context);
342346
final stream = store.streams[streamId];
@@ -815,6 +819,7 @@ class RecipientHeader extends StatelessWidget {
815819
switch (narrow) {
816820
case CombinedFeedNarrow():
817821
case MentionsNarrow():
822+
case StarredMessagesNarrow():
818823
return true;
819824

820825
case ChannelNarrow():

‎test/api/route/messages_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ void main() {
191191
checkNarrow(const MentionsNarrow().apiEncode(), jsonEncode([
192192
{'operator': 'is', 'operand': 'mentioned'},
193193
]));
194+
checkNarrow(const StarredMessagesNarrow().apiEncode(), jsonEncode([
195+
{'operator': 'is', 'operand': 'starred'},
196+
]));
194197

195198
checkNarrow([ApiNarrowDm([123, 234])], jsonEncode([
196199
{'operator': 'dm', 'operand': [123, 234]},

‎test/model/autocomplete_test.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,13 @@ void main() {
679679
check(() => MentionAutocompleteView.init(store: store, narrow: narrow))
680680
.throws<AssertionError>();
681681
});
682+
683+
test('StarredMessagesNarrow gives error', () async {
684+
await prepare(users: [eg.user(), eg.user()], messages: []);
685+
const narrow = StarredMessagesNarrow();
686+
check(() => MentionAutocompleteView.init(store: store, narrow: narrow))
687+
.throws<AssertionError>();
688+
});
682689
});
683690

684691
test('final results end-to-end', () async {

‎test/model/compose_test.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,14 @@ hello
239239
.equals(store.realmUrl.resolve('#narrow/is/mentioned/near/1'));
240240
});
241241

242+
test('StarredMessagesNarrow', () {
243+
final store = eg.store();
244+
check(narrowLink(store, const StarredMessagesNarrow()))
245+
.equals(store.realmUrl.resolve('#narrow/is/starred'));
246+
check(narrowLink(store, const StarredMessagesNarrow(), nearMessageId: 1))
247+
.equals(store.realmUrl.resolve('#narrow/is/starred/near/1'));
248+
});
249+
242250
test('ChannelNarrow / TopicNarrow', () {
243251
void checkNarrow(String expectedFragment, {
244252
required int streamId,

‎test/model/message_list_test.dart

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,44 @@ void main() {
14471447
check(model.messages.map((m) => m.id)).deepEquals(expected..add(301 + i));
14481448
}
14491449
});
1450+
1451+
test('in StarredMessagesNarrow', () async {
1452+
final stream = eg.stream(streamId: 1, name: 'muted stream');
1453+
const mutedTopic = 'muted';
1454+
await prepare(narrow: const StarredMessagesNarrow());
1455+
await store.addStream(stream);
1456+
await store.addUserTopic(stream, mutedTopic, UserTopicVisibilityPolicy.muted);
1457+
await store.addSubscription(eg.subscription(stream, isMuted: true));
1458+
1459+
List<Message> getMessages(int startingId) => [
1460+
eg.streamMessage(id: startingId,
1461+
stream: stream, topic: mutedTopic, flags: [MessageFlag.starred]),
1462+
eg.dmMessage(id: startingId + 1,
1463+
from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.starred]),
1464+
];
1465+
1466+
// Check filtering on fetchInitial…
1467+
await prepareMessages(foundOldest: false, messages: getMessages(201));
1468+
final expected = <int>[];
1469+
check(model.messages.map((m) => m.id))
1470+
.deepEquals(expected..addAll([201, 202]));
1471+
1472+
// … and on fetchOlder…
1473+
connection.prepare(json: olderResult(
1474+
anchor: 201, foundOldest: true, messages: getMessages(101)).toJson());
1475+
await model.fetchOlder();
1476+
checkNotified(count: 2);
1477+
check(model.messages.map((m) => m.id))
1478+
.deepEquals(expected..insertAll(0, [101, 102]));
1479+
1480+
// … and on MessageEvent.
1481+
final messages = getMessages(301);
1482+
for (var i = 0; i < 2; i += 1) {
1483+
await store.handleEvent(MessageEvent(id: 0, message: messages[i]));
1484+
checkNotifiedOnce();
1485+
check(model.messages.map((m) => m.id)).deepEquals(expected..add(301 + i));
1486+
}
1487+
});
14501488
});
14511489

14521490
test('recipient headers are maintained consistently', () async {
@@ -1693,6 +1731,7 @@ void checkInvariants(MessageListView model) {
16931731
case TopicNarrow():
16941732
case DmNarrow():
16951733
case MentionsNarrow():
1734+
case StarredMessagesNarrow():
16961735
}
16971736
}
16981737

‎test/model/narrow_test.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,15 @@ void main() {
162162
eg.streamMessage(flags: [MessageFlag.wildcardMentioned]))).isTrue();
163163
});
164164
});
165+
166+
group('StarredMessagesNarrow', () {
167+
test('containsMessage', () {
168+
const narrow = StarredMessagesNarrow();
169+
170+
check(narrow.containsMessage(
171+
eg.streamMessage(flags: []))).isFalse();
172+
check(narrow.containsMessage(
173+
eg.streamMessage(flags:[MessageFlag.starred]))).isTrue();
174+
});
175+
});
165176
}

‎test/model/unreads_test.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,17 @@ void main() {
227227
]);
228228
check(model.countInMentionsNarrow()).equals(2);
229229
});
230+
231+
test('countInStarredMessagesNarrow', () async {
232+
final stream = eg.stream();
233+
prepare();
234+
await channelStore.addStream(stream);
235+
fillWithMessages([
236+
eg.streamMessage(stream: stream, flags: []),
237+
eg.streamMessage(stream: stream, flags: [MessageFlag.starred]),
238+
]);
239+
check(model.countInStarredMessagesNarrow()).equals(0);
240+
});
230241
});
231242

232243
group('handleMessageEvent', () {

‎test/widgets/action_sheet_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,9 @@ void main() {
383383

384384
group('composing to reply is not yet supported', () {
385385
final testCases = [
386-
('CombinedFeedNarrow', const CombinedFeedNarrow(), eg.streamMessage()),
387-
('MentionsNarrow', const MentionsNarrow(), eg.streamMessage(flags: [MessageFlag.mentioned])),
386+
('CombinedFeedNarrow', const CombinedFeedNarrow(), eg.streamMessage()),
387+
('MentionsNarrow', const MentionsNarrow(), eg.streamMessage(flags: [MessageFlag.mentioned])),
388+
('StarredMessagesNarrow', const StarredMessagesNarrow(), eg.streamMessage(flags: [MessageFlag.starred])),
388389
];
389390

390391
for (final (narrowName, narrow, message) in testCases) {

‎test/widgets/message_list_test.dart

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ void main() {
124124
group('presents message content appropriately', () {
125125
// regression test for https://github.com/zulip/zulip-flutter/issues/736
126126
final testCases = [
127-
("Combined feed", const CombinedFeedNarrow(), <MessageFlag>[]),
128-
("MentionsNarrow", const MentionsNarrow(), [MessageFlag.mentioned]),
127+
("CombinedFeedNarrow", const CombinedFeedNarrow(), <MessageFlag>[]),
128+
("MentionsNarrow", const MentionsNarrow(), [MessageFlag.mentioned]),
129+
("StarredMessagesNarrow", const StarredMessagesNarrow(), [MessageFlag.starred]),
129130
];
130131
for (final (narrowName, narrow, flags) in testCases) {
131132
testWidgets('content in $narrowName not asked to consume insets (including bottom)', (tester) async {
@@ -713,11 +714,14 @@ void main() {
713714
group('show channel name conditionally', () {
714715
final mentionedMessage =
715716
eg.streamMessage(stream: stream, topic: 'topic name', flags: [MessageFlag.mentioned]);
717+
final starredMessage =
718+
eg.streamMessage(stream: stream, topic: 'topic name', flags: [MessageFlag.starred]);
716719
final testCases = [
717-
(true, 'CombinedFeedNarrow', const CombinedFeedNarrow(), message),
718-
(true, 'MentionsNarrow', const MentionsNarrow(), mentionedMessage),
719-
(false, 'ChannelNarrow', ChannelNarrow(stream.streamId), message),
720-
(false, 'TopicNarrow', TopicNarrow.ofMessage(message), message)
720+
(true, 'CombinedFeedNarrow', const CombinedFeedNarrow(), message),
721+
(true, 'MentionsNarrow', const MentionsNarrow(), mentionedMessage),
722+
(true, 'StarredMessagesNarrow', const StarredMessagesNarrow(), starredMessage),
723+
(false, 'ChannelNarrow', ChannelNarrow(stream.streamId), message),
724+
(false, 'TopicNarrow', TopicNarrow.ofMessage(message), message)
721725
];
722726

723727
for (final (showChannelName, narrowName, narrow, message) in testCases) {

0 commit comments

Comments
 (0)