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

notifications.py: Add regex for matching relative avatar URLs.

Browse Source
This commit is contained in:
Harshit Bansal
2017-09-20 23:27:37 +00:00
committed by Tim Abbott
parent 660ad5824b
commit e453586741
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/notifications.py
View File

@@ -70,8 +70,9 @@ def topic_narrow_url(realm, stream, topic):
def relative_to_full_url(base_url, content): def relative_to_full_url(base_url, content):
# type: (Text, Text) -> Text # type: (Text, Text) -> Text
# URLs for uploaded content are of the form: # URLs for uploaded content and avatars are of the form:
# "/user_uploads/abc.png". # "/user_uploads/abc.png".
# "/avatar/username@example.com?s=30".
# Make them full paths. Explanation for all the regexes below: # Make them full paths. Explanation for all the regexes below:
# (\=['\"]) matches anything that starts with `=` followed by `"` or `'`. # (\=['\"]) matches anything that starts with `=` followed by `"` or `'`.
# ([^\r\n\t\f <]) matches any character which is not a whitespace or `<`. # ([^\r\n\t\f <]) matches any character which is not a whitespace or `<`.
@@ -79,8 +80,8 @@ def relative_to_full_url(base_url, content):
# and ends in `>`. # and ends in `>`.
# The last positive lookahead ensures that we replace URLs only within a tag. # The last positive lookahead ensures that we replace URLs only within a tag.
content = re.sub( content = re.sub(
r"(?<=\=['\"])/user_uploads/([^\r\n\t\f <]*)(?=[^<]+>)", r"(?<=\=['\"])/(user_uploads|avatar)/([^\r\n\t\f <]*)(?=[^<]+>)",
base_url + r"/user_uploads/\1", content) base_url + r"/\1/\2", content)
# Inline images can't be displayed in the emails as the request # Inline images can't be displayed in the emails as the request
# from the mail server can't be authenticated because it has no # from the mail server can't be authenticated because it has no