unreads: Exclude muted DM conversations in combined-feed and all-dm counts

Author: chrisbobbe

lib/model/unreads.dart

@@ -228,9 +228,14 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier {
   // TODO: Implement unreads handling?
   int countInKeywordSearchNarrow() => 0;
 
+  /// The aggregated unread count for DM conversations.
+  ///
+  /// This excludes conversations that are considered muted,
+  /// by [UserStore.shouldMuteDmConversation].
   int countInDms() {
     int c = 0;
-    for (final messageIds in dms.values) {
+    for (final MapEntry(key: narrow, value: messageIds) in dms.entries) {
+      if (channelStore.shouldMuteDmConversation(narrow)) continue;
       c += messageIds.length;
     }
     return c;

test/model/unreads_test.dart

@@ -191,6 +191,7 @@ void main() {
       await store.addSubscription(eg.subscription(stream2));
       await store.addSubscription(eg.subscription(stream3, isMuted: true));
       await store.setUserTopic(stream1, 'a', UserTopicVisibilityPolicy.muted);
+      await store.setMutedUsers([eg.thirdUser.userId]);
       fillWithMessages([
         eg.streamMessage(stream: stream1, topic: 'a', flags: []),
         eg.streamMessage(stream: stream1, topic: 'b', flags: []),
@@ -200,7 +201,7 @@ void main() {
         eg.dmMessage(from: eg.otherUser, to: [eg.selfUser], flags: []),
         eg.dmMessage(from: eg.thirdUser, to: [eg.selfUser], flags: []),
       ]);
-      check(model.countInCombinedFeedNarrow()).equals(5);
+      check(model.countInCombinedFeedNarrow()).equals(4);
     });
 
     test('countInChannel/Narrow', () async {
@@ -274,12 +275,16 @@ void main() {
 
     test('countInDms', () async {
       prepare();
+      await store.setMutedUsers([eg.thirdUser.userId]);
       fillWithMessages([
+        // No one is muted: don't exclude
         eg.dmMessage(from: eg.otherUser, to: [eg.selfUser], flags: []),
+        // Everyone is muted: exclude
         eg.dmMessage(from: eg.thirdUser, to: [eg.selfUser], flags: []),
+        // One is muted, one isn't: don't exclude
         eg.dmMessage(from: eg.thirdUser, to: [eg.selfUser, eg.otherUser], flags: []),
       ]);
-      check(model.countInDms()).equals(3);
+      check(model.countInDms()).equals(2);
     });
   });