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

Pass Message object instead of message dict to do_claim_attachments.

Browse Source
This commit is contained in:
rahuldeve
2016-07-25 01:22:41 +05:30
committed by Tim Abbott
parent c61d149837
commit e06d5fbec9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/actions.py
View File

@@ -695,7 +695,7 @@ def do_send_messages(messages):
# Claim attachments in message # Claim attachments in message
for message in messages: for message in messages:
if Message.content_has_attachment(message['message'].content): if Message.content_has_attachment(message['message'].content):
do_claim_attachments(message) do_claim_attachments(message['message'])
for message in messages: for message in messages:
# Render Markdown etc. here and store (automatically) in # Render Markdown etc. here and store (automatically) in
@@ -3320,19 +3320,19 @@ def do_get_streams(user_profile, include_public=True, include_subscribed=True,
return streams return streams
def do_claim_attachments(message): def do_claim_attachments(message):
# type: (Mapping[str, Any]) -> List[Tuple[text_type, bool]] # type: (Message) -> List[Tuple[text_type, bool]]
attachment_url_list = attachment_url_re.findall(message['message'].content) attachment_url_list = attachment_url_re.findall(message.content)
results = [] results = []
for url in attachment_url_list: for url in attachment_url_list:
path_id = attachment_url_to_path_id(url) path_id = attachment_url_to_path_id(url)
user_profile = message['message'].sender user_profile = message.sender
is_message_realm_public = False is_message_realm_public = False
if message['message'].recipient.type == Recipient.STREAM: if message.recipient.type == Recipient.STREAM:
is_message_realm_public = Stream.objects.get(id=message['message'].recipient.type_id).is_public() is_message_realm_public = Stream.objects.get(id=message.recipient.type_id).is_public()
if path_id is not None: if path_id is not None:
is_claimed = claim_attachment(user_profile, path_id, message['message'], is_claimed = claim_attachment(user_profile, path_id, message,
is_message_realm_public) is_message_realm_public)
results.append((path_id, is_claimed)) results.append((path_id, is_claimed))