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

message.py: Change domain to realm_id in render_markdown args.

Browse Source
This commit is contained in:
Rishi Gupta
2017-01-02 21:42:27 -08:00
committed by Tim Abbott
parent c6e12e74be
commit b206d6f251
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/lib/message.py
View File

@@ -18,7 +18,6 @@ from zerver.lib.str_utils import force_bytes, dict_with_str_keys
from zerver.lib.timestamp import datetime_to_timestamp from zerver.lib.timestamp import datetime_to_timestamp
from zerver.models import ( from zerver.models import (
get_realm,
get_display_recipient_by_id, get_display_recipient_by_id,
Message, Message,
Recipient, Recipient,
@@ -213,7 +212,7 @@ class MessageDict(object):
# It's unfortunate that we need to have side effects on the message # It's unfortunate that we need to have side effects on the message
# in some cases. # in some cases.
rendered_content = render_markdown(message, content, sender_realm_domain) rendered_content = render_markdown(message, content, realm_id=sender_realm_id)
message.rendered_content = rendered_content message.rendered_content = rendered_content
message.rendered_content_version = bugdown.version message.rendered_content_version = bugdown.version
message.save_rendered_content() message.save_rendered_content()
@@ -297,8 +296,8 @@ def access_message(user_profile, message_id):
# stream in your realm, so return the message, user_message pair # stream in your realm, so return the message, user_message pair
return (message, user_message) return (message, user_message)
def render_markdown(message, content, domain=None, realm_alert_words=None, message_users=None): def render_markdown(message, content, realm_id=None, realm_alert_words=None, message_users=None):
# type: (Message, Text, Optional[Text], Optional[RealmAlertWords], Set[UserProfile]) -> Text # type: (Message, Text, Optional[int], Optional[RealmAlertWords], Set[UserProfile]) -> Text
"""Return HTML for given markdown. Bugdown may add properties to the """Return HTML for given markdown. Bugdown may add properties to the
message object such as `mentions_user_ids` and `mentions_wildcard`. message object such as `mentions_user_ids` and `mentions_wildcard`.
These are only on this Django object and are not saved in the These are only on this Django object and are not saved in the
@@ -316,9 +315,7 @@ def render_markdown(message, content, domain=None, realm_alert_words=None, messa
message.alert_words = set() message.alert_words = set()
message.links_for_preview = set() message.links_for_preview = set()
if domain: if realm_id is None:
realm_id = get_realm(domain).id
else:
realm_id = message.sender.realm.id realm_id = message.sender.realm.id
if message.sending_client.name == "zephyr_mirror" and message.sender.realm.is_zephyr_mirror_realm: if message.sending_client.name == "zephyr_mirror" and message.sender.realm.is_zephyr_mirror_realm:
# Use slightly customized Markdown processor for content # Use slightly customized Markdown processor for content

2
zerver/views/messages.py
View File

@@ -952,7 +952,7 @@ def render_message_backend(request, user_profile, content=REQ()):
message.content = content message.content = content
message.sending_client = request.client message.sending_client = request.client
rendered_content = render_markdown(message, content, domain=user_profile.realm.domain) rendered_content = render_markdown(message, content, realm_id=user_profile.realm.id)
return json_success({"rendered": rendered_content}) return json_success({"rendered": rendered_content})
@authenticated_json_post_view @authenticated_json_post_view