buttons/helper/model/themes: Displays unread message counts of muted streams and topics.

Fixes #209

Author: manojkestur

zulipterminal/config/themes.py

@@ -61,6 +61,7 @@
     light_magenta='#c8f',
     white='#fff',
     black='g19',
+    light_gray='#aaa'
 )
 
 DEF = dict(DEF_base,
@@ -166,6 +167,8 @@
          None,             DEF['yellow'],             DEF['black']),
         ('edit_time',      'light blue',              'black',
          None,             DEF['light_blue'],         DEF['black']),
+        ('muted_stream', 'light gray',          'black',
+         None,            DEF['light_gray'],          DEF['black']),
     ],
     'gruvbox_dark': [
         # default colorscheme on 16 colors, gruvbox colorscheme
@@ -242,6 +245,8 @@
          None,             YELLOW,            BLACK),
         ('edit_time',      'light blue',      'black',
          None,             LIGHTBLUE,         BLACK),
+        ('muted_stream',   'yellow',   'black',
+         None,            YELLOW,             BLACK),
     ],
     'zt_light': [
         (None,             'black',           'white'),
@@ -280,6 +285,7 @@
         ('edit_tag',       'white',           'dark gray'),
         ('edit_author',    'dark green',      'white'),
         ('edit_time',      'dark blue',       'white'),
+        ('muted_stream',  'light gray',   'white'),
     ],
     'zt_blue': [
         (None,             'black',           'light blue'),
@@ -318,6 +324,7 @@
         ('edit_tag',       'white',           'dark blue'),
         ('edit_author',    'dark gray',       'light blue'),
         ('edit_time',      'dark blue',       'light blue'),
+        ('muted_stream',      'dark gray',       'light blue'),
     ]
 }  # type: Dict[str, ThemeSpec]
 

zulipterminal/helper.py

@@ -204,12 +204,9 @@ def _set_count_in_view(controller: Any, new_count: int,
             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
+            for stream_button in stream_buttons_log:
+                if stream_button.stream_id == stream_id:
+                    stream_button.update_count(stream_button.count + new_count)
             # FIXME: Update unread_counts['unread_topics']?
             if controller.model.is_muted_topic(stream_id, msg_topic):
                 add_to_counts = False
@@ -438,7 +435,7 @@ def index_messages(messages: List[Message],
 def classify_unread_counts(model: Any) -> UnreadCounts:
     # TODO: support group pms
     unread_msg_counts = model.initial_data['unread_msgs']
-
+    topic_muted = False
     unread_counts = UnreadCounts(
         all_msg=0,
         all_pms=0,
@@ -465,14 +462,17 @@ def classify_unread_counts(model: Any) -> UnreadCounts:
         if not model.is_user_subscribed_to_stream(stream_id):
             continue
         if model.is_muted_topic(stream_id, stream['topic']):
-            continue
+            if model.is_private:
+                continue
+            topic_muted = True
+
         stream_topic = (stream_id, stream['topic'])
         unread_counts['unread_topics'][stream_topic] = count
         if not unread_counts['streams'].get(stream_id):
             unread_counts['streams'][stream_id] = count
         else:
             unread_counts['streams'][stream_id] += count
-        if stream_id not in model.muted_streams:
+        if stream_id not in model.muted_streams and not topic_muted:
             unread_counts['all_msg'] += count
 
     # store unread count of group pms in `unread_huddles`

zulipterminal/model.py

@@ -84,6 +84,7 @@ def __init__(self, controller: Any) -> None:
         self.stream_id = -1
         self.recipients = frozenset()  # type: FrozenSet[Any]
         self.index = initial_index
+        self.is_private = False
 
         self.user_id = -1
         self.user_email = ""

zulipterminal/ui_tools/buttons.py

@@ -147,9 +147,8 @@ def __init__(self, properties: StreamData,
         self.stream_name = properties['name']
         self.stream_id = properties['id']
         self.color = properties['color']
-        is_private = properties['invite_only']
         self.description = properties['description']
-
+        controller.model.is_private = properties['invite_only']
         self.model = controller.model
         self.count = count
         self.view = view
@@ -167,21 +166,24 @@ def __init__(self, properties: StreamData,
         super().__init__(controller,
                          caption=self.stream_name,
                          show_function=controller.narrow_to_stream,
-                         prefix_character=(
-                            self.color, 'P' if is_private else '#'),
+                         prefix_character=(self.color,
+                                           'P' if controller.model.is_private
+                                           else '#'),
                          width=width,
                          count=count)
 
-        # Mark muted streams 'M' during button creation.
+        # Mark muted streams with different color during button creation.
         if self.model.is_muted_stream(self.stream_id):
-            self.update_widget('M')
+            self.mark_muted()
 
     def mark_muted(self) -> None:
-        self.update_widget('M')
+        self.text_color = 'muted_stream'
+        self.update_count(self.count)
         self.view.home_button.update_count(
             self.model.unread_counts['all_msg'])
 
     def mark_unmuted(self, unread_count: int) -> None:
+        self.text_color = None
         self.update_count(unread_count)
         self.view.home_button.update_count(
             self.model.unread_counts['all_msg'])
@@ -244,7 +246,8 @@ def __init__(self, stream_id: int, topic: str,
             self.mark_muted()
 
     def mark_muted(self) -> None:
-        self.update_widget('M')
+        self.text_color = 'muted_stream'
+        self.update_count(self.count)
     # TODO: Handle event-based approach for topic-muting.