initial commit: addded stream button.

Author: plugyawn

zulipterminal/core.py

@@ -612,6 +612,9 @@ def narrow_to_all_messages(
     def narrow_to_all_pm(self, *, contextual_message_id: Optional[int] = None) -> None:
         self._narrow_to(anchor=contextual_message_id, pms=True)
 
+    def narrow_to_all_streams(self, *, contextual_message_id: Optional[int] = None) -> None:
+        self._narrow_to(anchor=contextual_message_id, stream_messages = True)
+
     def narrow_to_all_starred(self) -> None:
         # NOTE: Should we allow maintaining anchor focus here?
         # (nothing currently requires narrowing around a message id)

zulipterminal/helper.py

@@ -415,6 +415,11 @@ def index_messages(messages: List[Message], model: Any, index: Index) -> Index:
             if narrow[0][1] == "mentioned":
                 if {"mentioned", "wildcard_mentioned"} & set(msg["flags"]):
                     index["mentioned_msg_ids"].add(msg["id"])
+            
+            if narrow[0][1] == "stream_messages":
+                index["stream_msg_ids"].add(msg["id"])
+                if msg["type"] == "stream":
+                    index["stream_msg_ids"].add(msg["id"])
 
             if msg["type"] == "private":
                 index["private_msg_ids"].add(msg["id"])
@@ -690,6 +695,9 @@ def notify_if_message_sent_outside_narrow(
         ]
         pm_with_narrow = [["pm_with", ", ".join(recipient_emails)]]
         check_narrow_and_notify(pm_narrow, pm_with_narrow, controller)
+    elif message["type"] == "stream_messages":
+        stream_narrow = [["is", "stream_messages"]]
+
 
 
 def hash_util_decode(string: str) -> str:

zulipterminal/model.py

@@ -282,6 +282,7 @@ def set_narrow(
         topic: Optional[str] = None,
         pms: bool = False,
         pm_with: Optional[str] = None,
+        stream_messages: bool = False,
         starred: bool = False,
         mentioned: bool = False,
         active_button: Any = None,
@@ -292,6 +293,7 @@ def set_narrow(
             frozenset(["stream"]): [["stream", stream]],
             frozenset(["stream", "topic"]): [["stream", stream], ["topic", topic]],
             frozenset(["pms"]): [["is", "private"]],
+            frozenset(["stream_messages"]): [["is", "stream_messages"]],
             frozenset(["pm_with"]): [["pm_with", pm_with]],
             frozenset(["starred"]): [["is", "starred"]],
             frozenset(["mentioned"]): [["is", "mentioned"]],
@@ -365,13 +367,18 @@ def get_message_ids_in_current_narrow(self) -> Set[int]:
                 ids = index["topic_msg_ids"][stream_id].get(topic, set())
         elif narrow[0][1] == "private":
             ids = index["private_msg_ids"]
+        elif narrow[0][1] == "stream_messages":
+            stream_ids = [ids for ids in index["all_msg_ids"] if ids not in index["private_msg_ids"]]
+            index["stream_msg_ids"] = stream_ids
+            ids = stream_ids
         elif narrow[0][0] == "pm_with":
             recipients = self.recipients
             ids = index["private_msg_ids_by_user_ids"].get(recipients, set())
-        elif narrow[0][1] == "starred":
+        elif narrow[0][1] == "starred": 
             ids = index["starred_msg_ids"]
         elif narrow[0][1] == "mentioned":
             ids = index["mentioned_msg_ids"]
+
         return ids.copy()
 
     def current_narrow_contains_message(self, message: Message) -> bool:

zulipterminal/ui.py

@@ -256,6 +256,8 @@ def keypress(self, size: urwid_Box, key: str) -> Optional[str]:
             self.starred_button.activate(key)
         elif is_command_key("ALL_MENTIONS", key):
             self.mentioned_button.activate(key)
+        elif is_command_key("STREAM_NARROW", key):
+            self.all_streams_button.activate(key)
         elif is_command_key("SEARCH_PEOPLE", key):
             # Start User Search if not in editor_mode
             self.show_left_panel(visible=False)

zulipterminal/ui_tools/boxes.py

@@ -58,6 +58,8 @@
 if typing.TYPE_CHECKING:
     from zulipterminal.model import Model
 
+from zulipterminal.platform_code import notify
+
 
 class _MessageEditState(NamedTuple):
     message_id: int
@@ -1064,6 +1066,7 @@ def top_search_bar(self) -> Any:
             ]
         else:
             self.model.controller.view.search_box.text_box.set_edit_text("")
+        notify(str(curr_narrow), "Helo")
         if curr_narrow == []:
             text_to_fill = "All messages"
         elif len(curr_narrow) == 1 and curr_narrow[0][1] == "private":
@@ -1072,6 +1075,8 @@ def top_search_bar(self) -> Any:
             text_to_fill = "Starred messages"
         elif len(curr_narrow) == 1 and curr_narrow[0][1] == "mentioned":
             text_to_fill = "Mentions"
+        elif len(curr_narrow) == 1 and curr_narrow[0][1] == "stream_messages":
+            text_to_fill = "All Stream messages"
         elif self.message["type"] == "stream":
             assert self.stream_id is not None
             bar_color = self.model.stream_dict[self.stream_id]["color"]

zulipterminal/ui_tools/buttons.py

@@ -141,6 +141,18 @@ def __init__(self, *, controller: Any, count: int) -> None:
             count_style="unread_count",
         )
 
+class StreamMessagesButton(TopButton):
+    def __init__(self, *, controller:Any, count: int) -> None:
+        button_text =  f"Streams          [{primary_key_for_command('STREAM_NARROW')}]"
+
+        super().__init__(
+            controller = controller,
+            caption = button_text,
+            show_function=controller.narrow_to_all_streams,
+            prefix_character="",
+            count = count,
+            count_style = "unread_count",
+        )
 
 class StarredButton(TopButton):
     def __init__(self, *, controller: Any, count: int) -> None:

zulipterminal/ui_tools/views.py

@@ -47,6 +47,7 @@
     MessageLinkButton,
     PMButton,
     StarredButton,
+    StreamMessagesButton,
     StreamButton,
     TopicButton,
     UserButton,
@@ -801,7 +802,7 @@ def __init__(self, view: Any) -> None:
         self.stream_v = self.streams_view()
 
         self.is_in_topic_view = False
-        contents = [(4, self.menu_v), self.stream_v]
+        contents = [(5, self.menu_v), self.stream_v]
         super().__init__(contents)
 
     def menu_view(self) -> Any:
@@ -815,7 +816,11 @@ def menu_view(self) -> Any:
             controller=self.controller,
             count=self.model.unread_counts["all_mentions"],
         )
-
+        
+        count = self.model.unread_counts.get("all_msg", 0) - self.model.unread_counts.get("all_pms", 0)
+        self.view.all_streams_button = StreamMessagesButton(
+            controller = self.controller, count = count
+        )
         # Starred messages are by definition read already
         count = len(self.model.initial_data["starred_messages"])
         self.view.starred_button = StarredButton(
@@ -825,6 +830,7 @@ def menu_view(self) -> Any:
             self.view.home_button,
             self.view.pm_button,
             self.view.mentioned_button,
+            self.view.all_streams_button,
             self.view.starred_button,
         ]
         w = urwid.ListBox(urwid.SimpleFocusListWalker(menu_btn_list))