paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

email_mirror: Change default topic name if subject ends up empty.

Browse Source 
If the email subject is something like `Fwd:`, it gets stripped to an
empty string, activating the "(no topic)" override. This however leads
to failure if the organization enables the setting forcing every message
to have a topic. Such emails should still go through, so we should just
change the topic value used.
This commit is contained in:
Mateusz Mandera
2024-07-09 01:15:12 +02:00
committed by Tim Abbott
parent 9f67452155
commit 8f461b3c03
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/tests/test_email_mirror.py
View File

@@ -326,7 +326,7 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase):
self.assertEqual(message.content, "TestStreamEmailMessages body")
self.assert_message_stream_name(message, stream.name)
self.assertEqual(message.topic_name(), "(no topic)")
self.assertEqual(message.topic_name(), "Email with no subject")
def test_receive_stream_email_messages_subject_with_nonprintable_chars(
self,
@@ -358,7 +358,7 @@ class TestStreamEmailMessagesSuccess(ZulipTestCase):
process_message(incoming_valid_message)
message = most_recent_message(user_profile)
self.assertEqual(message.topic_name(), "(no topic)")
self.assertEqual(message.topic_name(), "Email with no subject")
def test_receive_private_stream_email_messages_success(self) -> None:
user_profile = self.example_user("hamlet")
@@ -1617,12 +1617,12 @@ class TestStreamEmailMessagesSubjectStripping(ZulipTestCase):
message = most_recent_message(user_profile)
self.assertEqual("Test", message.topic_name())
# If after stripping we get an empty subject, it should get set to (no topic)
# If after stripping we get an empty subject, it should get set to Email with no subject
del incoming_valid_message["Subject"]
incoming_valid_message["Subject"] = "Re: Fwd: Re: "
process_message(incoming_valid_message)
message = most_recent_message(user_profile)
self.assertEqual("(no topic)", message.topic_name())
self.assertEqual("Email with no subject", message.topic_name())
def test_strip_from_subject(self) -> None:
subject_list = orjson.loads(self.fixture_data("subjects.json", type="email"))