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

stream settings: Use the .show-sender version of email address.

Browse Source 
As requested in #13134.
This commit is contained in:
Mateusz Mandera
2019-09-05 11:34:05 +02:00
committed by Tim Abbott
parent 307d8d8758
commit dfd6771237
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/email_mirror_helpers.py
View File

@@ -26,10 +26,10 @@ def get_email_gateway_message_string_from_address(address: str) -> str:
return msg_string
def encode_email_address(stream: Stream) -> str:
return encode_email_address_helper(stream.name, stream.email_token)
def encode_email_address(stream: Stream, show_sender: bool=False) -> str:
return encode_email_address_helper(stream.name, stream.email_token, show_sender)
def encode_email_address_helper(name: str, email_token: str) -> str:
def encode_email_address_helper(name: str, email_token: str, show_sender: bool=False) -> str:
# Some deployments may not use the email gateway
if settings.EMAIL_GATEWAY_PATTERN == '':
return ''
@@ -52,6 +52,9 @@ def encode_email_address_helper(name: str, email_token: str) -> str:
else:
encoded_token = email_token
if show_sender:
encoded_token += ".show-sender"
return settings.EMAIL_GATEWAY_PATTERN % (encoded_token,)
def decode_email_address(email: str) -> Tuple[str, Dict[str, bool]]: