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

settings: Add setting for SYSTEM_BOT_REALM.

Browse Source 
This fixes some subtle JavaScript exceptions we've been getting in
zulipchat.com, caused by the system bot realm there not being "zulip"
interacting with get_cross_realm_users.
This commit is contained in:
Tim Abbott
2017-11-27 14:46:07 -08:00
parent 25fd4c5508
commit 8b935f4e99
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/actions.py
View File

@@ -3889,7 +3889,7 @@ def get_cross_realm_dicts():
# type: () -> List[Dict[str, Any]] # type: () -> List[Dict[str, Any]]
users = bulk_get_users(list(get_cross_realm_emails()), None, users = bulk_get_users(list(get_cross_realm_emails()), None,
base_query=UserProfile.objects.filter( base_query=UserProfile.objects.filter(
realm__string_id="zulip")).values() realm__string_id=settings.SYSTEM_BOT_REALM)).values()
return [{'email': user.email, return [{'email': user.email,
'user_id': user.id, 'user_id': user.id,
'is_admin': user.is_realm_admin, 'is_admin': user.is_realm_admin,
@@ -3899,7 +3899,7 @@ def get_cross_realm_dicts():
# Important: We filter here, is addition to in # Important: We filter here, is addition to in
# `base_query`, because of how bulk_get_users shares its # `base_query`, because of how bulk_get_users shares its
# cache with other UserProfile caches. # cache with other UserProfile caches.
if user.realm.string_id == 'zulip'] if user.realm.string_id == settings.SYSTEM_BOT_REALM]
def do_send_confirmation_email(invitee, referrer, body): def do_send_confirmation_email(invitee, referrer, body):
# type: (PreregistrationUser, UserProfile, Optional[str]) -> None # type: (PreregistrationUser, UserProfile, Optional[str]) -> None

2
zerver/lib/export.py
View File

@@ -585,7 +585,7 @@ def fetch_user_profile(response: TableData, config: Config, context: Context) ->
def fetch_user_profile_cross_realm(response: TableData, config: Config, context: Context) -> None: def fetch_user_profile_cross_realm(response: TableData, config: Config, context: Context) -> None:
realm = context['realm'] realm = context['realm']
if realm.string_id == "zulip": if realm.string_id == settings.SYSTEM_BOT_REALM:
response['zerver_userprofile_crossrealm'] = [] response['zerver_userprofile_crossrealm'] = []
else: else:
response['zerver_userprofile_crossrealm'] = [dict(email=x.email, id=x.id) for x in [ response['zerver_userprofile_crossrealm'] = [dict(email=x.email, id=x.id) for x in [

4
zproject/settings.py
View File

@@ -225,6 +225,10 @@ DEFAULT_SETTINGS.update({
'FEEDBACK_BOT': 'feedback@zulip.com', 'FEEDBACK_BOT': 'feedback@zulip.com',
'FEEDBACK_BOT_NAME': 'Zulip Feedback Bot', 'FEEDBACK_BOT_NAME': 'Zulip Feedback Bot',
'FEEDBACK_STREAM': None, 'FEEDBACK_STREAM': None,
# SYSTEM_BOT_REALM would be a constant always set to 'zulip',
# except that it isn't that on zulipchat.com. We will likely do a
# migration and eliminate this parameter in the future.
'SYSTEM_BOT_REALM': 'zulip',
# Structurally, we will probably eventually merge # Structurally, we will probably eventually merge
# analytics into part of the main server, rather # analytics into part of the main server, rather