paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

email_mirror: Extract handle_header_content function.

Browse Source
This commit is contained in:
Mateusz Mandera
2020-01-30 15:01:07 +01:00
committed by Tim Abbott
parent dd969b5339
commit 49b76318c6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/email_mirror.py
View File

@@ -150,11 +150,17 @@ def construct_zulip_body(message: message.Message, realm: Realm, show_sender: bo
body = '(No email body)'
if show_sender:
sender = str(make_header(decode_header(message.get("From"))))
sender = handle_header_content(message.get("From", ""))
body = "From: %s\n%s" % (sender, body)
return body
def handle_header_content(content: str) -> str:
"""
Deals with converting encoded headers to readable python string.
"""
return str(make_header(decode_header(content)))
## Sending the Zulip ##
class ZulipEmailForwardUserError(ZulipEmailForwardError):
@@ -318,7 +324,7 @@ def is_forwarded(subject: str) -> bool:
return bool(re.match(reg, subject, flags=re.IGNORECASE))
def process_stream_message(to: str, message: message.Message) -> None:
subject_header = str(make_header(decode_header(message.get("Subject", ""))))
subject_header = handle_header_content(message.get("Subject", ""))
subject = strip_from_subject(subject_header) or "(no topic)"
stream, options = decode_stream_email_address(to)