Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

embedded bots: Stop using internal_send_message for non-system-bots. 

This was causing problems, because internal_send_message assumes that
there is a unique user (across all realms) with the given email
address (which is sorta required to support cross-realm bot messages
the way it does).

With this change, it now, in practice, only sends cross-realm bot
messages.
This commit is contained in:
Tim Abbott 2017-11-26 17:00:04 -08:00
parent 27582782fa
commit 6952dcbdac
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zerver/lib/bot_lib.py
View File

@ -6,8 +6,9 @@ import sys
import time import time
import re import re
import importlib import importlib
from zerver.lib.actions import internal_send_message from zerver.lib.actions import internal_send_private_message, \
from zerver.models import UserProfile internal_send_stream_message, internal_send_huddle_message
from zerver.models import UserProfile, get_user
from zerver.lib.bot_storage import get_bot_state, set_bot_state, \ from zerver.lib.bot_storage import get_bot_state, set_bot_state, \
is_key_in_bot_state, get_bot_state_size, remove_bot_state is_key_in_bot_state, get_bot_state_size, remove_bot_state
from zerver.lib.bot_config import get_bot_config from zerver.lib.bot_config import get_bot_config
@ -68,10 +69,24 @@ class EmbeddedBotHandler:
def send_message(self, message: Dict[str, Any]) -> None: def send_message(self, message: Dict[str, Any]) -> None:
if not self._rate_limit.is_legal(): if not self._rate_limit.is_legal():
self._rate_limit.show_error_and_exit() self._rate_limit.show_error_and_exit()
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, if message['type'] == 'stream':
recipient_type_name=message['type'], recipients=recipients, internal_send_stream_message(self.user_profile.realm, self.user_profile, message['to'],
topic_name=message.get('subject', None), content=message['content']) message['subject'], message['content'])
return
assert message['type'] == 'private'
# Ensure that it's a comma-separated list, even though the
# usual 'to' field could be either a List[str] or a str.
recipients = ','.join(message['to']).split(',')
if len(message['to']) == 1:
recipient_user = get_user(recipients[0], self.user_profile.realm)
internal_send_private_message(self.user_profile.realm, self.user_profile,
recipient_user, message['content'])
else:
internal_send_huddle_message(self.user_profile.realm, self.user_profile,
recipients, message['content'])
def send_reply(self, message: Dict[str, Any], response: str) -> None: def send_reply(self, message: Dict[str, Any], response: str) -> None:
if message['type'] == 'private': if message['type'] == 'private':