mirror of
https://github.com/zulip/zulip.git
synced 2025-11-06 15:03:34 +00:00
0f7628280f
If cordelia searches on pm-with:iago@zulip.com,cordelia@zulip.com, we now properly treat that the same way as pm-with:iago@zulip.com. Before this fix, the query would initially go through the huddle code path. The symptom wasn't completely obvious, as eventually a deeper function would return a recipient id corresponding to a single PM with @iago@zulip.com, but we would only get messages where iago was the recipient, and not any messages where he was the sender to cordelia. I put the helper function for this in zerver/lib/addressee, which is somewhat speculative. Eventually, we'll want pm-with queries to allow for user ids, and I imagine there will be some shared logic with other Addressee code in terms of how we handle these strings. The way we deal with lists of emails/users for various endpoints is kind of haphazard in the current code, although granted it's mostly just repeating the same simple patterns. It would be nice for some of this code to converge a bit. This affects new messages, typing indicators, search filters, etc., and some endpoints have strange legacy stuff like supporting JSON-encoded lists, so it's not trivial to clean this up. Tweaked by tabbott to add some additional tests.
147 lines
5.1 KiB
Python
147 lines
5.1 KiB
Python
|
|
from typing import Iterable, List, Optional, Sequence
|
|
|
|
from django.core.exceptions import ValidationError
|
|
from django.utils.translation import ugettext as _
|
|
from zerver.lib.exceptions import JsonableError
|
|
from zerver.lib.request import JsonableError
|
|
from zerver.models import (
|
|
Realm,
|
|
UserProfile,
|
|
get_user_including_cross_realm,
|
|
)
|
|
|
|
def raw_pm_with_emails(email_str: str, my_email: str) -> List[str]:
|
|
frags = email_str.split(',')
|
|
emails = [s.strip().lower() for s in frags]
|
|
emails = [email for email in emails if email]
|
|
|
|
if len(emails) > 1:
|
|
emails = [email for email in emails if email != my_email.lower()]
|
|
|
|
return emails
|
|
|
|
def user_profiles_from_unvalidated_emails(emails: Iterable[str], realm: Realm) -> List[UserProfile]:
|
|
user_profiles = [] # type: List[UserProfile]
|
|
for email in emails:
|
|
try:
|
|
user_profile = get_user_including_cross_realm(email, realm)
|
|
except UserProfile.DoesNotExist:
|
|
raise ValidationError(_("Invalid email '%s'") % (email,))
|
|
user_profiles.append(user_profile)
|
|
return user_profiles
|
|
|
|
def get_user_profiles(emails: Iterable[str], realm: Realm) -> List[UserProfile]:
|
|
try:
|
|
return user_profiles_from_unvalidated_emails(emails, realm)
|
|
except ValidationError as e:
|
|
assert isinstance(e.messages[0], str)
|
|
raise JsonableError(e.messages[0])
|
|
|
|
class Addressee:
|
|
# This is really just a holder for vars that tended to be passed
|
|
# around in a non-type-safe way before this class was introduced.
|
|
#
|
|
# It also avoids some nonsense where you have to think about whether
|
|
# topic should be None or '' for a PM, or you have to make an array
|
|
# of one stream.
|
|
#
|
|
# Eventually we can use this to cache Stream and UserProfile objects
|
|
# in memory.
|
|
#
|
|
# This should be treated as an immutable class.
|
|
def __init__(self, msg_type: str,
|
|
user_profiles: Optional[Sequence[UserProfile]]=None,
|
|
stream_name: Optional[str]=None,
|
|
topic: Optional[str]=None) -> None:
|
|
assert(msg_type in ['stream', 'private'])
|
|
self._msg_type = msg_type
|
|
self._user_profiles = user_profiles
|
|
self._stream_name = stream_name
|
|
self._topic = topic
|
|
|
|
def is_stream(self) -> bool:
|
|
return self._msg_type == 'stream'
|
|
|
|
def is_private(self) -> bool:
|
|
return self._msg_type == 'private'
|
|
|
|
def user_profiles(self) -> List[UserProfile]:
|
|
assert(self.is_private())
|
|
return self._user_profiles # type: ignore # assertion protects us
|
|
|
|
def stream_name(self) -> str:
|
|
assert(self.is_stream())
|
|
assert(self._stream_name is not None)
|
|
return self._stream_name
|
|
|
|
def topic(self) -> str:
|
|
assert(self.is_stream())
|
|
assert(self._topic is not None)
|
|
return self._topic
|
|
|
|
@staticmethod
|
|
def legacy_build(sender: UserProfile,
|
|
message_type_name: str,
|
|
message_to: Sequence[str],
|
|
topic_name: str,
|
|
realm: Optional[Realm]=None) -> 'Addressee':
|
|
|
|
# For legacy reason message_to used to be either a list of
|
|
# emails or a list of streams. We haven't fixed all of our
|
|
# callers yet.
|
|
if realm is None:
|
|
realm = sender.realm
|
|
|
|
if message_type_name == 'stream':
|
|
if len(message_to) > 1:
|
|
raise JsonableError(_("Cannot send to multiple streams"))
|
|
|
|
if message_to:
|
|
stream_name = message_to[0]
|
|
else:
|
|
# This is a hack to deal with the fact that we still support
|
|
# default streams (and the None will be converted later in the
|
|
# callpath).
|
|
if sender.default_sending_stream:
|
|
# Use the users default stream
|
|
stream_name = sender.default_sending_stream.name
|
|
else:
|
|
raise JsonableError(_('Missing stream'))
|
|
|
|
return Addressee.for_stream(stream_name, topic_name)
|
|
elif message_type_name == 'private':
|
|
emails = message_to
|
|
return Addressee.for_private(emails, realm)
|
|
else:
|
|
raise JsonableError(_("Invalid message type"))
|
|
|
|
@staticmethod
|
|
def for_stream(stream_name: str, topic: str) -> 'Addressee':
|
|
if topic is None:
|
|
raise JsonableError(_("Missing topic"))
|
|
topic = topic.strip()
|
|
if topic == "":
|
|
raise JsonableError(_("Topic can't be empty"))
|
|
return Addressee(
|
|
msg_type='stream',
|
|
stream_name=stream_name,
|
|
topic=topic,
|
|
)
|
|
|
|
@staticmethod
|
|
def for_private(emails: Sequence[str], realm: Realm) -> 'Addressee':
|
|
user_profiles = get_user_profiles(emails, realm)
|
|
return Addressee(
|
|
msg_type='private',
|
|
user_profiles=user_profiles,
|
|
)
|
|
|
|
@staticmethod
|
|
def for_user_profile(user_profile: UserProfile) -> 'Addressee':
|
|
user_profiles = [user_profile]
|
|
return Addressee(
|
|
msg_type='private',
|
|
user_profiles=user_profiles,
|
|
)
|