channel [nfc]: Rename references of ChannelStore/Impl to match new names

Author: Khader-1

lib/model/store.dart

@@ -226,7 +226,7 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
     connection ??= globalStore.apiConnectionFromAccount(account);
     assert(connection.zulipFeatureLevel == account.zulipFeatureLevel);
 
-    final streams = ChannelStoreImpl(initialSnapshot: initialSnapshot);
+    final channels = ChannelStoreImpl(initialSnapshot: initialSnapshot);
     return PerAccountStore._(
       globalStore: globalStore,
       connection: connection,
@@ -247,12 +247,12 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
         selfUserId: account.userId,
         typingStartedExpiryPeriod: Duration(milliseconds: initialSnapshot.serverTypingStartedExpiryPeriodMilliseconds),
       ),
-      streams: streams,
+      channels: channels,
       messages: MessageStoreImpl(),
       unreads: Unreads(
         initial: initialSnapshot.unreadMsgs,
         selfUserId: account.userId,
-        streamStore: streams,
+        channelStore: channels,
       ),
       recentDmConversationsView: RecentDmConversationsView(
         initial: initialSnapshot.recentPrivateConversations, selfUserId: account.userId),
@@ -272,15 +272,15 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
     required this.userSettings,
     required this.users,
     required this.typingStatus,
-    required ChannelStoreImpl streams,
+    required ChannelStoreImpl channels,
     required MessageStoreImpl messages,
     required this.unreads,
     required this.recentDmConversationsView,
   }) : assert(selfUserId == globalStore.getAccount(accountId)!.userId),
        assert(realmUrl == globalStore.getAccount(accountId)!.realmUrl),
        assert(realmUrl == connection.realmUrl),
        _globalStore = globalStore,
-       _streams = streams,
+       _channels = channels,
        _messages = messages;
 
   ////////////////////////////////////////////////////////////////
@@ -331,19 +331,19 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
   // Streams, topics, and stuff about them.
 
   @override
-  Map<int, ZulipStream> get streams => _streams.streams;
+  Map<int, ZulipStream> get streams => _channels.streams;
   @override
-  Map<String, ZulipStream> get streamsByName => _streams.streamsByName;
+  Map<String, ZulipStream> get streamsByName => _channels.streamsByName;
   @override
-  Map<int, Subscription> get subscriptions => _streams.subscriptions;
+  Map<int, Subscription> get subscriptions => _channels.subscriptions;
   @override
   UserTopicVisibilityPolicy topicVisibilityPolicy(int streamId, String topic) =>
-    _streams.topicVisibilityPolicy(streamId, topic);
+    _channels.topicVisibilityPolicy(streamId, topic);
 
-  final ChannelStoreImpl _streams;
+  final ChannelStoreImpl _channels;
 
   @visibleForTesting
-  ChannelStoreImpl get debugStreamStore => _streams;
+  ChannelStoreImpl get debugChannelStore => _channels;
 
   ////////////////////////////////
   // Messages, and summaries of messages.
@@ -474,17 +474,17 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
 
       case StreamEvent():
         assert(debugLog("server event: stream/${event.op}"));
-        _streams.handleStreamEvent(event);
+        _channels.handleStreamEvent(event);
         notifyListeners();
 
       case SubscriptionEvent():
         assert(debugLog("server event: subscription/${event.op}"));
-        _streams.handleSubscriptionEvent(event);
+        _channels.handleSubscriptionEvent(event);
         notifyListeners();
 
       case UserTopicEvent():
         assert(debugLog("server event: user_topic"));
-        _streams.handleUserTopicEvent(event);
+        _channels.handleUserTopicEvent(event);
         notifyListeners();
 
       case MessageEvent():

lib/model/unreads.dart

@@ -39,7 +39,7 @@ class Unreads extends ChangeNotifier {
   factory Unreads({
     required UnreadMessagesSnapshot initial,
     required int selfUserId,
-    required ChannelStore streamStore,
+    required ChannelStore channelStore,
   }) {
     final streams = <int, Map<String, QueueList<int>>>{};
     final dms = <DmNarrow, QueueList<int>>{};
@@ -63,7 +63,7 @@ class Unreads extends ChangeNotifier {
     }
 
     return Unreads._(
-      streamStore: streamStore,
+      channelStore: channelStore,
       streams: streams,
       dms: dms,
       mentions: mentions,
@@ -73,15 +73,15 @@ class Unreads extends ChangeNotifier {
   }
 
   Unreads._({
-    required this.streamStore,
+    required this.channelStore,
     required this.streams,
     required this.dms,
     required this.mentions,
     required this.oldUnreadsMissing,
     required this.selfUserId,
   });
 
-  final ChannelStore streamStore;
+  final ChannelStore channelStore;
 
   // TODO excluded for now; would need to handle nuances around muting etc.
   // int count;
@@ -136,7 +136,7 @@ class Unreads extends ChangeNotifier {
     }
     for (final MapEntry(key: streamId, value: topics) in streams.entries) {
       for (final MapEntry(key: topic, value: messageIds) in topics.entries) {
-        if (streamStore.isTopicVisible(streamId, topic)) {
+        if (channelStore.isTopicVisible(streamId, topic)) {
           c = c + messageIds.length;
         }
       }
@@ -158,7 +158,7 @@ class Unreads extends ChangeNotifier {
     if (topics == null) return 0;
     int c = 0;
     for (final entry in topics.entries) {
-      if (streamStore.isTopicVisible(streamId, entry.key)) {
+      if (channelStore.isTopicVisible(streamId, entry.key)) {
         c = c + entry.value.length;
       }
     }
@@ -179,7 +179,7 @@ class Unreads extends ChangeNotifier {
     if (topics == null) return 0;
     int c = 0;
     for (final entry in topics.entries) {
-      if (streamStore.isTopicVisibleInStream(streamId, entry.key)) {
+      if (channelStore.isTopicVisibleInStream(streamId, entry.key)) {
         c = c + entry.value.length;
       }
     }

test/model/channel_test.dart

@@ -193,8 +193,8 @@ void main() {
       final expectedStore = eg.store(initialSnapshot: eg.initialSnapshot(
         userTopics: expected,
       ));
-      check(store.debugStreamStore.topicVisibility)
-        .deepEquals(expectedStore.debugStreamStore.topicVisibility);
+      check(store.debugChannelStore.topicVisibility)
+        .deepEquals(expectedStore.debugChannelStore.topicVisibility);
     }
 
     test('data structure', () {
@@ -206,7 +206,7 @@ void main() {
           eg.userTopicItem(stream2, 'topic 3', UserTopicVisibilityPolicy.unknown),
           eg.userTopicItem(stream2, 'topic 4', UserTopicVisibilityPolicy.followed),
         ]));
-      check(store.debugStreamStore.topicVisibility).deepEquals({
+      check(store.debugChannelStore.topicVisibility).deepEquals({
         stream1.streamId: {
           'topic 1': UserTopicVisibilityPolicy.muted,
           'topic 2': UserTopicVisibilityPolicy.unmuted,

test/model/unreads_test.dart

@@ -16,7 +16,7 @@ void main() {
   // These variables are the common state operated on by each test.
   // Each test case calls [prepare] to initialize them.
   late Unreads model;
-  late PerAccountStore streamStore; // TODO reduce this to ChannelStore
+  late PerAccountStore channelStore; // TODO reduce this to ChannelStore
   late int notifiedCount;
 
   void checkNotified({required int count}) {
@@ -37,10 +37,10 @@ void main() {
       oldUnreadsMissing: false,
     ),
   }) {
-    streamStore = eg.store();
+    channelStore = eg.store();
     notifiedCount = 0;
     model = Unreads(initial: initial,
-        selfUserId: eg.selfUser.userId, streamStore: streamStore)
+        selfUserId: eg.selfUser.userId, channelStore: channelStore)
       ..addListener(() {
         notifiedCount++;
       });
@@ -157,11 +157,11 @@ void main() {
       final stream2 = eg.stream(streamId: 2, name: 'stream 2');
       final stream3 = eg.stream(streamId: 3, name: 'stream 3');
       prepare();
-      await streamStore.addStreams([stream1, stream2, stream3]);
-      await streamStore.addSubscription(eg.subscription(stream1));
-      await streamStore.addSubscription(eg.subscription(stream2));
-      await streamStore.addSubscription(eg.subscription(stream3, isMuted: true));
-      await streamStore.addUserTopic(stream1, 'a', UserTopicVisibilityPolicy.muted);
+      await channelStore.addStreams([stream1, stream2, stream3]);
+      await channelStore.addSubscription(eg.subscription(stream1));
+      await channelStore.addSubscription(eg.subscription(stream2));
+      await channelStore.addSubscription(eg.subscription(stream3, isMuted: true));
+      await channelStore.addUserTopic(stream1, 'a', UserTopicVisibilityPolicy.muted);
       fillWithMessages([
         eg.streamMessage(stream: stream1, topic: 'a', flags: []),
         eg.streamMessage(stream: stream1, topic: 'b', flags: []),
@@ -177,10 +177,10 @@ void main() {
     test('countInStream/Narrow', () async {
       final stream = eg.stream();
       prepare();
-      await streamStore.addStream(stream);
-      await streamStore.addSubscription(eg.subscription(stream));
-      await streamStore.addUserTopic(stream, 'a', UserTopicVisibilityPolicy.unmuted);
-      await streamStore.addUserTopic(stream, 'c', UserTopicVisibilityPolicy.muted);
+      await channelStore.addStream(stream);
+      await channelStore.addSubscription(eg.subscription(stream));
+      await channelStore.addUserTopic(stream, 'a', UserTopicVisibilityPolicy.unmuted);
+      await channelStore.addUserTopic(stream, 'c', UserTopicVisibilityPolicy.muted);
       fillWithMessages([
         eg.streamMessage(stream: stream, topic: 'a', flags: []),
         eg.streamMessage(stream: stream, topic: 'a', flags: []),
@@ -192,7 +192,7 @@ void main() {
       check(model.countInStream      (stream.streamId)).equals(5);
       check(model.countInStreamNarrow(stream.streamId)).equals(5);
 
-      await streamStore.handleEvent(SubscriptionUpdateEvent(id: 1,
+      await channelStore.handleEvent(SubscriptionUpdateEvent(id: 1,
         streamId: stream.streamId,
         property: SubscriptionProperty.isMuted, value: true));
       check(model.countInStream      (stream.streamId)).equals(2);