From cc8b83b2612fd5747d4815e70def8d6757d33168 Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Tue, 14 Jan 2020 13:05:14 +0100 Subject: [PATCH] email_mirror: Insert a new line before attachment links. --- zerver/lib/email_mirror.py | 2 ++ zerver/tests/test_email_mirror.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/zerver/lib/email_mirror.py b/zerver/lib/email_mirror.py index 9c429c7619..4f0271c12a 100644 --- a/zerver/lib/email_mirror.py +++ b/zerver/lib/email_mirror.py @@ -141,6 +141,8 @@ def construct_zulip_body(message: message.Message, realm: Realm, show_sender: bo if not include_footer: body = filter_footer(body) + if not body.endswith('\n'): + body += '\n' body += extract_and_upload_attachments(message, realm) body = body.strip() if not body: diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py index 710951ab89..a4c6cf40c3 100644 --- a/zerver/tests/test_email_mirror.py +++ b/zerver/tests/test_email_mirror.py @@ -422,7 +422,7 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase): target_realm=user_profile.realm) message = most_recent_message(user_profile) - self.assertEqual(message.content, "Test body[image.png](https://test_url)") + self.assertEqual(message.content, "Test body\n[image.png](https://test_url)") def test_message_with_invalid_attachment(self) -> None: user_profile = self.example_user('hamlet')