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

Rename subject -> topic_name in internal_send_message.

Browse Source
This commit is contained in:
Steve Howell
2017-10-27 05:36:15 -07:00
committed by Tim Abbott
parent 973ee97612
commit fbe5f93141
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/actions.py
View File

@@ -1864,10 +1864,10 @@ def internal_prep_private_message(realm, sender, recipient_user, content):
) )
def internal_send_message(realm, sender_email, recipient_type_name, recipients, def internal_send_message(realm, sender_email, recipient_type_name, recipients,
subject, content): topic_name, content):
# type: (Realm, Text, str, Text, Text, Text) -> None # type: (Realm, Text, str, Text, Text, Text) -> None
msg = internal_prep_message(realm, sender_email, recipient_type_name, recipients, msg = internal_prep_message(realm, sender_email, recipient_type_name, recipients,
subject, content) topic_name, content)
# internal_prep_message encountered an error # internal_prep_message encountered an error
if msg is None: if msg is None:

2
zerver/lib/bot_lib.py
View File

@@ -91,7 +91,7 @@ class EmbeddedBotHandler(object):
recipients = message['to'] if message['type'] == 'stream' else ','.join(message['to']) recipients = message['to'] if message['type'] == 'stream' else ','.join(message['to'])
internal_send_message(realm=self.user_profile.realm, sender_email=self.user_profile.email, internal_send_message(realm=self.user_profile.realm, sender_email=self.user_profile.email,
recipient_type_name=message['type'], recipients=recipients, recipient_type_name=message['type'], recipients=recipients,
subject=message.get('subject', None), content=message['content']) topic_name=message.get('subject', None), content=message['content'])
else: else:
self._rate_limit.show_error_and_exit() self._rate_limit.show_error_and_exit()