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

markdown: Clean render_markdown.

Browse Source 
Remove Message is None and not None case as the
render_message_backend passes a fake Message object.
This commit is contained in:
Nikhil Kumar Mishra
2018-03-19 01:07:47 +05:30
committed by Tim Abbott
parent 1e453981a3
commit 3b4ff4f75c
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/lib/message.py
View File

@@ -513,15 +513,14 @@ def render_markdown(message: Message,
else: else:
message_user_ids = user_ids message_user_ids = user_ids
if message is not None: message.mentions_wildcard = False
message.mentions_wildcard = False message.mentions_user_ids = set()
message.mentions_user_ids = set() message.mentions_user_group_ids = set()
message.mentions_user_group_ids = set() message.alert_words = set()
message.alert_words = set() message.links_for_preview = set()
message.links_for_preview = set()
if realm is None: if realm is None:
realm = message.get_realm() realm = message.get_realm()
possible_words = set() # type: Set[Text] possible_words = set() # type: Set[Text]
if realm_alert_words is not None: if realm_alert_words is not None:
@@ -529,12 +528,7 @@ def render_markdown(message: Message,
if user_id in message_user_ids: if user_id in message_user_ids:
possible_words.update(set(words)) possible_words.update(set(words))
if message is None: sent_by_bot = get_user_profile_by_id(message.sender_id).is_bot
# If we don't have a message, then we are in the compose preview
# codepath, so we know we are dealing with a human.
sent_by_bot = False
else:
sent_by_bot = get_user_profile_by_id(message.sender_id).is_bot
# DO MAIN WORK HERE -- call bugdown to convert # DO MAIN WORK HERE -- call bugdown to convert
rendered_content = bugdown.convert( rendered_content = bugdown.convert(