ui/boxes: Improve consistency of non-reply compose key behaviour.

Previously, `x` started a new message as expected from all locations,
with no pre-filled recipient.
In contrast, `c` would act as per the reply key on a private message,
would pre-fill the private recipients or stream, and was configured for
use only when focus was on the `MiddleColumnView`.

Now keypresses `x` and `c` always open up `private_box_view` and
`stream_box_view` respectively, with no boxes pre-filled. The scope of
`c` is expanded to enable its use even when focus is on the users list,
stream list, topics list, or top buttons.

Note that this behavior is slightly different from the webapp, where in
a stream narrow, `c` pre-fills the stream and prompts for a topic. This
is a slight change in behavior to before within the application too.

Tests added, and adjusted slightly by neiljp.

Fixes #871.

Author: mkp6781

tests/ui/test_ui.py

@@ -243,6 +243,19 @@ def test_keypress_ALL_MENTIONS(self, view, mocker, key, widget_size):
         view.model.controller.show_all_mentions.assert_called_once_with(view)
         assert view.body.focus_col == 1
 
+    @pytest.mark.parametrize('key', keys_for_command('STREAM_MESSAGE'))
+    def test_keypress_STREAM_MESSAGE(self, view, mocker, key, widget_size):
+        view.middle_column = mocker.Mock()
+        view.body = mocker.Mock()
+        view.controller.is_in_editor_mode = lambda: False
+        size = widget_size(view)
+
+        returned_key = view.keypress(size, key)
+
+        view.middle_column.keypress.assert_called_once_with(size, key)
+        assert returned_key == key
+        assert view.body.focus_col == 1
+
     @pytest.mark.parametrize('key', keys_for_command('SEARCH_PEOPLE'))
     @pytest.mark.parametrize('autohide', [True, False], ids=[
         'autohide', 'no_autohide'])

tests/ui/test_ui_tools.py

@@ -1858,6 +1858,40 @@ def test_main_view_generates_EDITED_label(self, mocker,
             assert label[0].text == 'EDITED'
             assert label[1][1] == 7
 
+    @pytest.mark.parametrize('key', keys_for_command('STREAM_MESSAGE'))
+    @pytest.mark.parametrize('narrow, expect_to_prefill', [
+        ([], False),
+        ([['stream', 'general']], False),
+        ([['stream', 'general'], ['topic', 'Test']], True),
+        ([['is', 'starred']], False),
+        ([['is', 'mentioned']], False),
+        ([['is', 'private']], False),
+        ([['pm_with', '[email protected]']], False),
+    ], ids=[
+        'all_messages_narrow',
+        'stream_narrow',
+        'topic_narrow',
+        'private_conversation_narrow',
+        'starred_messages_narrow',
+        'mentions_narrow',
+        'private_messages_narrow',
+    ])
+    def test_keypress_STREAM_MESSAGE(self, mocker, msg_box, widget_size,
+                                     narrow, expect_to_prefill, key):
+        write_box = msg_box.model.controller.view.write_box
+        msg_box.model.narrow = narrow
+        size = widget_size(msg_box)
+
+        msg_box.keypress(size, key)
+
+        if expect_to_prefill:
+            write_box.stream_box_view.assert_called_once_with(
+                caption='PTEST',
+                stream_id=205,
+            )
+        else:
+            write_box.stream_box_view.assert_called_once_with(0)
+
     @pytest.mark.parametrize('key', keys_for_command('EDIT_MESSAGE'))
     @pytest.mark.parametrize(['to_vary_in_each_message',
                               'realm_editing_allowed',

zulipterminal/ui.py

@@ -183,6 +183,7 @@ def keypress(self, size: Tuple[int, int], key: str) -> Optional[str]:
         elif (is_command_key('SEARCH_MESSAGES', key)
                 or is_command_key('NEXT_UNREAD_TOPIC', key)
                 or is_command_key('NEXT_UNREAD_PM', key)
+                or is_command_key('STREAM_MESSAGE', key)
                 or is_command_key('PRIVATE_MESSAGE', key)):
             self.body.focus_col = 1
             self.middle_column.keypress(size, key)

zulipterminal/ui_tools/boxes.py

@@ -1388,16 +1388,13 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
                     stream_id=self.stream_id,
                 )
         elif is_command_key('STREAM_MESSAGE', key):
-            if self.message['type'] == 'private':
-                self.model.controller.view.write_box.private_box_view(
-                    emails=self.recipient_emails,
-                    recipient_user_ids=self.recipient_ids,
-                )
-            elif self.message['type'] == 'stream':
+            if len(self.model.narrow) == 2:
                 self.model.controller.view.write_box.stream_box_view(
                     caption=self.message['display_recipient'],
                     stream_id=self.stream_id,
                 )
+            else:
+                self.model.controller.view.write_box.stream_box_view(0)
         elif is_command_key('STREAM_NARROW', key):
             if self.message['type'] == 'private':
                 self.model.controller.narrow_to_user(self)