paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 16:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

recipient_for_emails: Fix confusing type reuse.

Browse Source
This commit is contained in:
Tim Abbott
2017-03-19 21:20:24 -07:00
parent 7e5d5b5cce
commit e2eeef5118
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/actions.py
View File

@@ -1081,7 +1081,7 @@ def create_streams_if_needed(realm, stream_dicts):
return added_streams, existing_streams return added_streams, existing_streams
def recipient_for_emails(emails, not_forged_mirror_message, def recipient_for_emails(emails, not_forged_mirror_message,
user_profile, sender): forwarder_user_profile, sender):
# type: (Iterable[Text], bool, Optional[UserProfile], UserProfile) -> Recipient # type: (Iterable[Text], bool, Optional[UserProfile], UserProfile) -> Recipient
recipient_profile_ids = set() recipient_profile_ids = set()
@@ -1104,8 +1104,10 @@ def recipient_for_emails(emails, not_forged_mirror_message,
if email not in exempt_emails: if email not in exempt_emails:
realms.add(user_profile.realm_id) realms.add(user_profile.realm_id)
if not_forged_mirror_message and user_profile.id not in recipient_profile_ids: if not_forged_mirror_message:
raise ValidationError(_("User not authorized for this query")) assert forwarder_user_profile is not None
if forwarder_user_profile.id not in recipient_profile_ids:
raise ValidationError(_("User not authorized for this query"))
if len(realms) > 1: if len(realms) > 1:
raise ValidationError(_("You can't send private messages outside of your organization.")) raise ValidationError(_("You can't send private messages outside of your organization."))