buttons/helper/model: Display unread counts of muted streams and topics.

Fixes #209

Author: manojkestur

zulipterminal/helper.py

@@ -194,7 +194,8 @@ def _set_count_in_view(controller: Any, new_count: int,
             continue
 
         msg_type = message['type']
-        add_to_counts = True
+        text_color = None
+        unread_count_color = 'unread_count'
         if 'mentioned' in message['flags']:
             unread_counts['all_mentions'] += new_count
             all_mentioned.update_count(unread_counts['all_mentions'])
@@ -203,23 +204,28 @@ def _set_count_in_view(controller: Any, new_count: int,
             stream_id = message['stream_id']
             msg_topic = message['subject']
             if controller.model.is_muted_stream(stream_id):
-                add_to_counts = False  # if muted, don't add to eg. all_msg
-            else:
-                for stream_button in stream_buttons_log:
-                    if stream_button.stream_id == stream_id:
-                        stream_button.update_count(stream_button.count
-                                                   + new_count)
-                        break
+                controller.model.add_to_counts = False
+                # if muted, don't add to eg. all_msg
+                text_color = 'muted'
+                unread_count_color = 'muted'
+            for stream_button in stream_buttons_log:
+                if stream_button.stream_id == stream_id:
+                    stream_button.update_count(stream_button.count
+                                               + new_count, text_color,
+                                               unread_count_color)
             # FIXME: Update unread_counts['unread_topics']?
             if controller.model.is_muted_topic(stream_id, msg_topic):
-                add_to_counts = False
+                controller.model.add_to_counts = False
+                text_color = 'muted'
+                unread_count_color = 'muted'
             if is_open_topic_view and stream_id == toggled_stream_id:
                 # If topic_view is open for incoming messages's stream,
                 # We update the respective TopicButton count accordingly.
                 for topic_button in topic_buttons_log:
                     if topic_button.topic_name == msg_topic:
                         topic_button.update_count(topic_button.count
-                                                  + new_count)
+                                                  + new_count, text_color,
+                                                  unread_count_color)
         else:
             for user_button in user_buttons_log:
                 if user_button.user_id == user_id:
@@ -228,7 +234,7 @@ def _set_count_in_view(controller: Any, new_count: int,
             unread_counts['all_pms'] += new_count
             all_pm.update_count(unread_counts['all_pms'])
 
-        if add_to_counts:
+        if controller.model.add_to_counts:
             unread_counts['all_msg'] += new_count
             all_msg.update_count(unread_counts['all_msg'])
 

zulipterminal/model.py

@@ -86,6 +86,7 @@ def __init__(self, controller: Any) -> None:
         self.stream_id = -1
         self.recipients = frozenset()  # type: FrozenSet[Any]
         self.index = initial_index
+        self.add_to_counts = True
 
         self.user_id = -1
         self.user_email = ""
@@ -754,11 +755,13 @@ def get_stream_by_id(streams: List[StreamData], stream_id: int
                     unread_count = self.unread_counts['streams'][stream_id]
                     if event['value']:  # Unmuting streams
                         self.muted_streams.remove(stream_id)
-                        self.unread_counts['all_msg'] += unread_count
+                        if self.add_to_counts:
+                            self.unread_counts['all_msg'] += unread_count
                         stream_button.mark_unmuted(unread_count)
                     else:  # Muting streams
                         self.muted_streams.add(stream_id)
-                        self.unread_counts['all_msg'] -= unread_count
+                        if self.add_to_counts:
+                            self.unread_counts['all_msg'] -= unread_count
                         stream_button.mark_muted()
                     self.controller.update_screen()
                 elif event.get('property', None) == 'pin_to_top':

zulipterminal/ui_tools/buttons.py

@@ -6,7 +6,6 @@
 from typing_extensions import TypedDict
 
 from zulipterminal.config.keys import is_command_key, primary_key_for_command
-from zulipterminal.config.symbols import MUTE_MARKER
 from zulipterminal.helper import (
     StreamData, edit_mode_captions, hash_util_decode,
 )
@@ -49,15 +48,16 @@ def __init__(self, controller: Any, caption: str,
         self.controller = controller
         urwid.connect_signal(self, 'click', self.activate)
 
-    def update_count(self, count: int, text_color: Optional[str]=None) -> None:
+    def update_count(self, count: int, text_color: Optional[str]=None,
+                     unread_count_color: str='unread_count') -> None:
         new_color = self.original_color if text_color is None else text_color
 
         self.count = count
         if count == 0:
             count_text = ''
         else:
             count_text = str(count)
-        self.update_widget(('unread_count', count_text), new_color)
+        self.update_widget((unread_count_color, count_text), new_color)
 
     def update_widget(self, count_text: Tuple[str, str],
                       text_color: Optional[str]) -> Any:
@@ -181,7 +181,7 @@ def __init__(self, properties: StreamData,
             self.mark_muted()
 
     def mark_muted(self) -> None:
-        self.update_widget(('muted', MUTE_MARKER), 'muted')
+        self.update_count(self.count, 'muted', 'muted')
         self.view.home_button.update_count(
             self.model.unread_counts['all_msg'])
 
@@ -252,7 +252,7 @@ def __init__(self, stream_id: int, topic: str,
             self.mark_muted()
 
     def mark_muted(self) -> None:
-        self.update_widget(('muted',  MUTE_MARKER), 'muted')
+        self.update_count(self.count, 'muted', 'muted')
     # TODO: Handle event-based approach for topic-muting.