Skip to content

Commit 664fbe4

Browse files
Khader-1Khader-1
committed
narrow [nfc]: Rename StreamNarrow to ChannelNarrow
Fixes parts of zulip#631
1 parent 6324bf3 commit 664fbe4

20 files changed

+78
-78
lines changed

‎lib/model/autocomplete.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class MentionAutocompleteView extends ChangeNotifier {
214214
int? streamId;
215215
String? topic;
216216
switch (narrow) {
217-
case StreamNarrow():
217+
case ChannelNarrow():
218218
streamId = narrow.streamId;
219219
case TopicNarrow():
220220
streamId = narrow.streamId;

‎lib/model/internal_link.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Narrow? _interpretNarrowSegments(List<String> segments, PerAccountStore store) {
196196
if (topicElement != null) {
197197
return TopicNarrow(streamId, topicElement.operand);
198198
} else {
199-
return StreamNarrow(streamId);
199+
return ChannelNarrow(streamId);
200200
}
201201
}
202202
return null;

‎lib/model/message_list.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
363363
DmMessage() => true,
364364
};
365365

366-
case StreamNarrow(:final streamId):
366+
case ChannelNarrow(:final streamId):
367367
assert(message is StreamMessage && message.streamId == streamId);
368368
if (message is! StreamMessage) return false;
369369
return store.isTopicVisibleInStream(streamId, message.topic);
@@ -380,7 +380,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {
380380
bool get _allMessagesVisible {
381381
switch (narrow) {
382382
case CombinedFeedNarrow():
383-
case StreamNarrow():
383+
case ChannelNarrow():
384384
return false;
385385

386386
case TopicNarrow():

‎lib/model/narrow.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class CombinedFeedNarrow extends Narrow {
6565
int get hashCode => 'CombinedFeedNarrow'.hashCode;
6666
}
6767

68-
class StreamNarrow extends Narrow {
69-
const StreamNarrow(this.streamId);
68+
class ChannelNarrow extends Narrow {
69+
const ChannelNarrow(this.streamId);
7070

7171
final int streamId;
7272

@@ -79,16 +79,16 @@ class StreamNarrow extends Narrow {
7979
ApiNarrow apiEncode() => [ApiNarrowStream(streamId)];
8080

8181
@override
82-
String toString() => 'StreamNarrow($streamId)';
82+
String toString() => 'ChannelNarrow($streamId)';
8383

8484
@override
8585
bool operator ==(Object other) {
86-
if (other is! StreamNarrow) return false;
86+
if (other is! ChannelNarrow) return false;
8787
return other.streamId == streamId;
8888
}
8989

9090
@override
91-
int get hashCode => Object.hash('StreamNarrow', streamId);
91+
int get hashCode => Object.hash('ChannelNarrow', streamId);
9292
}
9393

9494
class TopicNarrow extends Narrow implements SendableNarrow {

‎lib/model/unreads.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class Unreads extends ChangeNotifier {
197197
switch (narrow) {
198198
case CombinedFeedNarrow():
199199
return countInCombinedFeedNarrow();
200-
case StreamNarrow():
200+
case ChannelNarrow():
201201
return countInStreamNarrow(narrow.streamId);
202202
case TopicNarrow():
203203
return countInTopicNarrow(narrow.streamId, narrow.topic);

‎lib/widgets/actions.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Future<void> _legacyMarkNarrowAsRead(BuildContext context, Narrow narrow) async
120120
switch (narrow) {
121121
case CombinedFeedNarrow():
122122
await markAllAsRead(connection);
123-
case StreamNarrow(:final streamId):
123+
case ChannelNarrow(:final streamId):
124124
await markStreamAsRead(connection, streamId: streamId);
125125
case TopicNarrow(:final streamId, :final topic):
126126
await markTopicAsRead(connection, streamId: streamId, topicName: topic);

‎lib/widgets/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ class HomePage extends StatelessWidget {
295295
ElevatedButton(
296296
onPressed: () => Navigator.push(context,
297297
MessageListPage.buildRoute(context: context,
298-
narrow: StreamNarrow(testStreamId!))),
298+
narrow: ChannelNarrow(testStreamId!))),
299299
child: const Text("#test here")), // scaffolding hack, see above
300300
],
301301
])));

‎lib/widgets/compose_box.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class _StreamContentInput extends StatefulWidget {
321321
required this.focusNode,
322322
});
323323

324-
final StreamNarrow narrow;
324+
final ChannelNarrow narrow;
325325
final ComposeContentController controller;
326326
final ComposeTopicController topicController;
327327
final FocusNode focusNode;
@@ -921,7 +921,7 @@ class _StreamComposeBox extends StatefulWidget {
921921
const _StreamComposeBox({super.key, required this.narrow});
922922

923923
/// The narrow on view in the message list.
924-
final StreamNarrow narrow;
924+
final ChannelNarrow narrow;
925925

926926
@override
927927
State<_StreamComposeBox> createState() => _StreamComposeBoxState();
@@ -1027,7 +1027,7 @@ class ComposeBox extends StatelessWidget {
10271027
Widget build(BuildContext context) {
10281028
final narrow = this.narrow;
10291029
switch (narrow) {
1030-
case StreamNarrow():
1030+
case ChannelNarrow():
10311031
return _StreamComposeBox(key: controllerKey, narrow: narrow);
10321032
case TopicNarrow():
10331033
return _FixedDestinationComposeBox(key: controllerKey, narrow: narrow);

‎lib/widgets/message_list.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class _MessageListPageState extends State<MessageListPage> implements MessageLis
8585
case CombinedFeedNarrow():
8686
appBarBackgroundColor = null; // i.e., inherit
8787

88-
case StreamNarrow(:final streamId):
88+
case ChannelNarrow(:final streamId):
8989
case TopicNarrow(:final streamId):
9090
final subscription = store.subscriptions[streamId];
9191
appBarBackgroundColor = subscription != null
@@ -170,7 +170,7 @@ class MessageListAppBarTitle extends StatelessWidget {
170170
case CombinedFeedNarrow():
171171
return Text(zulipLocalizations.combinedFeedPageTitle);
172172

173-
case StreamNarrow(:var streamId):
173+
case ChannelNarrow(:var streamId):
174174
final store = PerAccountStoreWidget.of(context);
175175
final stream = store.streams[streamId];
176176
final streamName = stream?.name ?? '(unknown channel)';
@@ -704,7 +704,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
704704
streamWidget = GestureDetector(
705705
onTap: () => Navigator.push(context,
706706
MessageListPage.buildRoute(context: context,
707-
narrow: StreamNarrow(message.streamId))),
707+
narrow: ChannelNarrow(message.streamId))),
708708
child: Row(
709709
crossAxisAlignment: CrossAxisAlignment.center,
710710
children: [

‎lib/widgets/subscription_list.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class SubscriptionItem extends StatelessWidget {
217217
onTap: () {
218218
Navigator.push(context,
219219
MessageListPage.buildRoute(context: context,
220-
narrow: StreamNarrow(subscription.streamId)));
220+
narrow: ChannelNarrow(subscription.streamId)));
221221
},
222222
child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
223223
const SizedBox(width: 16),

‎test/api/route/messages_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void main() {
181181
}
182182

183183
checkNarrow(const CombinedFeedNarrow().apiEncode(), jsonEncode([]));
184-
checkNarrow(const StreamNarrow(12).apiEncode(), jsonEncode([
184+
checkNarrow(const ChannelNarrow(12).apiEncode(), jsonEncode([
185185
{'operator': 'stream', 'operand': 12},
186186
]));
187187
checkNarrow(const TopicNarrow(12, 'stuff').apiEncode(), jsonEncode([

‎test/model/autocomplete_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void main() {
168168
});
169169

170170
test('MentionAutocompleteView misc', () async {
171-
const narrow = StreamNarrow(1);
171+
const narrow = ChannelNarrow(1);
172172
final store = eg.store();
173173
await store.addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
174174
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
@@ -185,7 +185,7 @@ void main() {
185185

186186
test('MentionAutocompleteView not starve timers', () {
187187
fakeAsync((binding) async {
188-
const narrow = StreamNarrow(1);
188+
const narrow = ChannelNarrow(1);
189189
final store = eg.store();
190190
await store.addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
191191
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
@@ -220,7 +220,7 @@ void main() {
220220
});
221221

222222
test('MentionAutocompleteView yield between batches of 1000', () async {
223-
const narrow = StreamNarrow(1);
223+
const narrow = ChannelNarrow(1);
224224
final store = eg.store();
225225
for (int i = 0; i < 2500; i++) {
226226
await store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));
@@ -243,7 +243,7 @@ void main() {
243243
});
244244

245245
test('MentionAutocompleteView new query during computation replaces old', () async {
246-
const narrow = StreamNarrow(1);
246+
const narrow = ChannelNarrow(1);
247247
final store = eg.store();
248248
for (int i = 0; i < 1500; i++) {
249249
await store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));
@@ -278,7 +278,7 @@ void main() {
278278

279279
test('MentionAutocompleteView mutating store.users while in progress does not '
280280
'prevent query from finishing', () async {
281-
const narrow = StreamNarrow(1);
281+
const narrow = ChannelNarrow(1);
282282
final store = eg.store();
283283
for (int i = 0; i < 2500; i++) {
284284
await store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));
@@ -525,10 +525,10 @@ void main() {
525525
checkRankEqual(narrow, [users[3], users[4]]);
526526
});
527527

528-
test('StreamNarrow: stream recency > DM recency', () async {
528+
test('ChannelNarrow: stream recency > DM recency', () async {
529529
final users = List.generate(4, (i) => eg.user());
530530
final stream = eg.stream();
531-
final narrow = StreamNarrow(stream.streamId);
531+
final narrow = ChannelNarrow(stream.streamId);
532532
await prepare(users: users, messages: [
533533
eg.streamMessage(sender: users[1], stream: stream),
534534
eg.streamMessage(sender: users[0], stream: stream),

‎test/model/compose_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ hello
231231
.equals(store.realmUrl.resolve('#narrow/near/1'));
232232
});
233233

234-
test('StreamNarrow / TopicNarrow', () {
234+
test('ChannelNarrow / TopicNarrow', () {
235235
void checkNarrow(String expectedFragment, {
236236
required int streamId,
237237
required String name,
@@ -242,7 +242,7 @@ hello
242242
final store = eg.store();
243243
await store.addStream(eg.stream(streamId: streamId, name: name));
244244
final narrow = topic == null
245-
? StreamNarrow(streamId)
245+
? ChannelNarrow(streamId)
246246
: TopicNarrow(streamId, topic);
247247
check(narrowLink(store, narrow, nearMessageId: nearMessageId))
248248
.equals(store.realmUrl.resolve(expectedFragment));

‎test/model/internal_link_test.dart

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ void main() {
159159
eg.stream(streamId: 123, name: 'topic'),
160160
];
161161

162-
group('"/#narrow/stream/<...>" returns expected StreamNarrow', () {
162+
group('"/#narrow/stream/<...>" returns expected ChannelNarrow', () {
163163
const testCases = [
164-
('/#narrow/stream/check', StreamNarrow(1)),
165-
('/#narrow/stream/stream/', StreamNarrow(5)),
166-
('/#narrow/stream/topic/', StreamNarrow(123)),
164+
('/#narrow/stream/check', ChannelNarrow(1)),
165+
('/#narrow/stream/stream/', ChannelNarrow(5)),
166+
('/#narrow/stream/topic/', ChannelNarrow(123)),
167167
];
168168
testExpectedNarrows(testCases, streams: streams);
169169
});
@@ -185,8 +185,8 @@ void main() {
185185

186186
group('Both `stream` and `channel` can be used interchangeably', () {
187187
const testCases = [
188-
('/#narrow/stream/check', StreamNarrow(1)),
189-
('/#narrow/channel/check', StreamNarrow(1)),
188+
('/#narrow/stream/check', ChannelNarrow(1)),
189+
('/#narrow/channel/check', ChannelNarrow(1)),
190190
('/#narrow/stream/check/topic/test', TopicNarrow(1, 'test')),
191191
('/#narrow/channel/check/topic/test', TopicNarrow(1, 'test')),
192192
('/#narrow/stream/check/topic/test/near/378333', TopicNarrow(1, 'test')),
@@ -267,9 +267,9 @@ void main() {
267267
eg.stream(streamId: 3, name: 'some.stream'),
268268
];
269269
const testCases = [
270-
('/#narrow/stream/some_stream', StreamNarrow(1)),
271-
('/#narrow/stream/some.20stream', StreamNarrow(2)),
272-
('/#narrow/stream/some.2Estream', StreamNarrow(3)),
270+
('/#narrow/stream/some_stream', ChannelNarrow(1)),
271+
('/#narrow/stream/some.20stream', ChannelNarrow(2)),
272+
('/#narrow/stream/some.2Estream', ChannelNarrow(3)),
273273
('/#narrow/stream/some_stream/topic/some_topic', TopicNarrow(1, 'some_topic')),
274274
('/#narrow/stream/some_stream/topic/some.20topic', TopicNarrow(1, 'some topic')),
275275
('/#narrow/stream/some_stream/topic/some.2Etopic', TopicNarrow(1, 'some.topic')),
@@ -280,7 +280,7 @@ void main() {
280280

281281
group('parseInternalLink edge cases', () {
282282
void testExpectedStreamNarrow(String testCase, int? streamId) {
283-
final streamNarrow = (streamId != null) ? StreamNarrow(streamId) : null;
283+
final streamNarrow = (streamId != null) ? ChannelNarrow(streamId) : null;
284284
testExpectedNarrows([(testCase, streamNarrow)], streams: [
285285
eg.stream(streamId: 1, name: "general"),
286286
]);
@@ -316,11 +316,11 @@ void main() {
316316
eg.stream(streamId: 5, name: '--help'),
317317
];
318318
const testCases = [
319-
('#narrow/stream/test-team/', StreamNarrow(1)),
320-
('#narrow/stream/311/', StreamNarrow(2)),
321-
('#narrow/stream/311-/', StreamNarrow(3)),
322-
('#narrow/stream/311-help/', StreamNarrow(4)),
323-
('#narrow/stream/--help/', StreamNarrow(5)),
319+
('#narrow/stream/test-team/', ChannelNarrow(1)),
320+
('#narrow/stream/311/', ChannelNarrow(2)),
321+
('#narrow/stream/311-/', ChannelNarrow(3)),
322+
('#narrow/stream/311-help/', ChannelNarrow(4)),
323+
('#narrow/stream/--help/', ChannelNarrow(5)),
324324
];
325325
testExpectedNarrows(testCases, streams: streams);
326326
});
@@ -333,9 +333,9 @@ void main() {
333333
eg.stream(streamId: 311, name: 'collider'),
334334
];
335335
const testCases = [
336-
('#narrow/stream/311/', StreamNarrow(311)),
337-
('#narrow/stream/311-/', StreamNarrow(311)),
338-
('#narrow/stream/311-help/', StreamNarrow(311)),
336+
('#narrow/stream/311/', ChannelNarrow(311)),
337+
('#narrow/stream/311-/', ChannelNarrow(311)),
338+
('#narrow/stream/311-help/', ChannelNarrow(311)),
339339
];
340340
testExpectedNarrows(testCases, streams: streams);
341341
});
@@ -349,11 +349,11 @@ void main() {
349349
eg.stream(streamId: 5, name: 'topic'),
350350
];
351351
const testCases = [
352-
('#narrow/stream/check/', StreamNarrow(1)),
353-
('#narrow/stream/bot.20testing/', StreamNarrow(2)),
354-
('#narrow/stream/check.2EAPI/', StreamNarrow(3)),
355-
('#narrow/stream/stream/', StreamNarrow(4)),
356-
('#narrow/stream/topic/', StreamNarrow(5)),
352+
('#narrow/stream/check/', ChannelNarrow(1)),
353+
('#narrow/stream/bot.20testing/', ChannelNarrow(2)),
354+
('#narrow/stream/check.2EAPI/', ChannelNarrow(3)),
355+
('#narrow/stream/stream/', ChannelNarrow(4)),
356+
('#narrow/stream/topic/', ChannelNarrow(5)),
357357

358358
('#narrow/stream/check.API/', null),
359359
];

0 commit comments

Comments
 (0)