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

import: Handle corner case around EMAIL_GATEWAY_BOT emails.

Browse Source
This commit is contained in:
Tim Abbott
2019-01-02 14:44:47 -08:00
parent 8cfea958de
commit b63f8b59b2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/import_realm.py
View File

@@ -718,6 +718,10 @@ def do_import_realm(import_dir: Path, subdomain: str) -> Realm:
# Remap the user IDs for notification_bot and friends to their # Remap the user IDs for notification_bot and friends to their
# appropriate IDs on this server # appropriate IDs on this server
for item in data['zerver_userprofile_crossrealm']: for item in data['zerver_userprofile_crossrealm']:
if item['email'].startswith("emailgateway@"):
# The email gateway bot's email is customized to a
# different domain on some servers.
item['email'] = settings.EMAIL_GATEWAY_BOT
logging.info("Adding to ID map: %s %s" % (item['id'], get_system_bot(item['email']).id)) logging.info("Adding to ID map: %s %s" % (item['id'], get_system_bot(item['email']).id))
new_user_id = get_system_bot(item['email']).id new_user_id = get_system_bot(item['email']).id
update_id_map(table='user_profile', old_id=item['id'], new_id=new_user_id) update_id_map(table='user_profile', old_id=item['id'], new_id=new_user_id)