Skip to content

model/boxes: Allow users to post stream messages without a topic. #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

model/boxes: Allow users to post stream messages without a topic. #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
215e82b
refactor: boxes: Swap inner & outer if statements in WriteBox keypress.
kaustubh-nair Aug 5, 2020
123aabb
boxes: Allow users to post stream messages without a topic.
kaustubh-nair Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions tests/ui_tools/test_boxes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,47 @@ def test_generic_autocomplete_emojis(self, write_box, text,
typeahead_string = write_box.generic_autocomplete(text, state)
assert typeahead_string == required_typeahead

@pytest.mark.parametrize('topic_entered_by_user, topic_sent_to_server', [
('', '(no topic)'),
('hello', 'hello'),
(' ', '(no topic)'),
], ids=[
'empty_topic',
'non_empty_topic',
'topic_with_whitespace',
])
@pytest.mark.parametrize('msg_edit_id', [10, None], ids=[
'update_message',
'send_message',
])
@pytest.mark.parametrize('key', keys_for_command('SEND_MESSAGE'))
def test_keypress_SEND_MESSAGE_no_topic(self, mocker, write_box,
msg_edit_id, topic_entered_by_user,
topic_sent_to_server, key):
write_box.stream_write_box = mocker.Mock()
write_box.msg_write_box = mocker.Mock()
write_box.title_write_box = mocker.Mock()
write_box.msg_write_box.edit_text = ''
write_box.to_write_box = None
size = (20,)
write_box.msg_edit_id = msg_edit_id
write_box.title_write_box.edit_text = topic_entered_by_user

write_box.keypress(size, key)

if msg_edit_id:
write_box.model.update_stream_message.assert_called_once_with(
topic=topic_sent_to_server,
content=write_box.msg_write_box.edit_text,
msg_id=msg_edit_id,
)
else:
write_box.model.send_stream_message.assert_called_once_with(
stream=write_box.stream_write_box.edit_text,
topic=topic_sent_to_server,
content=write_box.msg_write_box.edit_text
)

@pytest.mark.parametrize(['key', 'current_typeahead_mode',
'expected_typeahead_mode',
'expect_footer_was_reset'], [
Expand Down
26 changes: 16 additions & 10 deletions zulipterminal/ui_tools/boxes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import re
from collections import OrderedDict, defaultdict
from datetime import date, datetime
from sys import platform
Expand Down Expand Up @@ -197,25 +198,30 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
self.view.set_footer_text()

if is_command_key('SEND_MESSAGE', key):
if self.msg_edit_id:
if not self.to_write_box:
if not self.to_write_box:
if re.fullmatch(r'\s*', self.title_write_box.edit_text):
topic = '(no topic)'
else:
topic = self.title_write_box.edit_text

if self.msg_edit_id:
success = self.model.update_stream_message(
topic=self.title_write_box.edit_text,
topic=topic,
content=self.msg_write_box.edit_text,
msg_id=self.msg_edit_id,
)
else:
success = self.model.update_private_message(
content=self.msg_write_box.edit_text,
msg_id=self.msg_edit_id,
)
else:
if not self.to_write_box:
success = self.model.send_stream_message(
stream=self.stream_write_box.edit_text,
topic=self.title_write_box.edit_text,
topic=topic,
content=self.msg_write_box.edit_text
)
else:
if self.msg_edit_id:
success = self.model.update_private_message(
content=self.msg_write_box.edit_text,
msg_id=self.msg_edit_id,
)
else:
success = self.model.send_private_message(
recipients=self.to_write_box.edit_text,
Expand Down