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

Rename get_cross_realm_users to get_cross_realm_emails.

Browse Source
This commit is contained in:
Steve Howell
2016-11-02 13:57:59 -07:00
committed by Tim Abbott
parent 50361ca980
commit 6324fe9ddf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/actions.py
View File

@@ -35,7 +35,7 @@ from zerver.models import Realm, RealmEmoji, Stream, UserProfile, UserActivity,
UserActivityInterval, get_active_user_dicts_in_realm, get_active_streams, \ UserActivityInterval, get_active_user_dicts_in_realm, get_active_streams, \
realm_filters_for_domain, RealmFilter, receives_offline_notifications, \ realm_filters_for_domain, RealmFilter, receives_offline_notifications, \
ScheduledJob, realm_filters_for_domain, get_owned_bot_dicts, \ ScheduledJob, realm_filters_for_domain, get_owned_bot_dicts, \
get_old_unclaimed_attachments, get_cross_realm_users, receives_online_notifications get_old_unclaimed_attachments, get_cross_realm_emails, receives_online_notifications
from zerver.lib.alert_words import alert_words_in_realm from zerver.lib.alert_words import alert_words_in_realm
from zerver.lib.avatar import get_avatar_url, avatar_url from zerver.lib.avatar import get_avatar_url, avatar_url
@@ -913,7 +913,7 @@ def recipient_for_emails(emails, not_forged_mirror_message,
# We exempt cross-realm bots from the check that all the recipients # We exempt cross-realm bots from the check that all the recipients
# are in the same domain. # are in the same domain.
realm_domains = set() realm_domains = set()
exempt_emails = get_cross_realm_users() exempt_emails = get_cross_realm_emails()
if sender.email not in exempt_emails: if sender.email not in exempt_emails:
realm_domains.add(sender.realm.domain) realm_domains.add(sender.realm.domain)

2
zerver/models.py
View File

@@ -1089,7 +1089,7 @@ def get_prereg_user_by_email(email):
# invite. # invite.
return PreregistrationUser.objects.filter(email__iexact=email.strip()).latest("invited_at") return PreregistrationUser.objects.filter(email__iexact=email.strip()).latest("invited_at")
def get_cross_realm_users(): def get_cross_realm_emails():
# type: () -> Set[text_type] # type: () -> Set[text_type]
return set(settings.CROSS_REALM_BOT_EMAILS) return set(settings.CROSS_REALM_BOT_EMAILS)

4
zerver/views/__init__.py
View File

@@ -22,7 +22,7 @@ from zerver.models import Message, UserProfile, Stream, Subscription, Huddle, \
get_stream, UserPresence, get_recipient, name_changes_disabled, \ get_stream, UserPresence, get_recipient, name_changes_disabled, \
split_email_to_domain, resolve_email_to_domain, email_to_username, get_realm, \ split_email_to_domain, resolve_email_to_domain, email_to_username, get_realm, \
completely_open, get_unique_open_realm, email_allowed_for_realm, \ completely_open, get_unique_open_realm, email_allowed_for_realm, \
get_cross_realm_users, resolve_subdomain_to_realm, list_of_domains_for_realm get_cross_realm_emails, resolve_subdomain_to_realm, list_of_domains_for_realm
from zerver.lib.actions import do_change_password, do_change_full_name, do_change_is_admin, \ from zerver.lib.actions import do_change_password, do_change_full_name, do_change_is_admin, \
do_activate_user, do_create_user, do_create_realm, set_default_streams, \ do_activate_user, do_create_user, do_create_realm, set_default_streams, \
update_user_presence, do_events_register, \ update_user_presence, do_events_register, \
@@ -594,7 +594,7 @@ def home(request):
first_in_realm = first_in_realm, first_in_realm = first_in_realm,
prompt_for_invites = prompt_for_invites, prompt_for_invites = prompt_for_invites,
notifications_stream = notifications_stream, notifications_stream = notifications_stream,
cross_realm_user_emails = list(get_cross_realm_users()), cross_realm_user_emails = list(get_cross_realm_emails()),
# Stream message notification settings: # Stream message notification settings:
stream_desktop_notifications_enabled = stream_desktop_notifications_enabled =