Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

import: Don't assume user_profile_id attribute is set on emojis. 

The s3 import code path made a hard assumption about `user_profile_id`
being set (we'd already fixed this in the local uploads code path).

Ideally, it should be, and I've opened #10268 for fixing that, but for
now this is how it needs to work.
This commit is contained in:
Tim Abbott 2018-08-10 08:55:59 -07:00
parent cf8a0ae819
commit 1ecbf49c93
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/lib/import_realm.py
View File

@ -505,8 +505,9 @@ def import_uploads_s3(bucket_name: str, import_dir: Path, processing_avatars: bo
re_map_foreign_keys_internal(records, 'records', 'realm_id', related_table="realm", re_map_foreign_keys_internal(records, 'records', 'realm_id', related_table="realm",
id_field=True) id_field=True)
re_map_foreign_keys_internal(records, 'records', 'user_profile_id', if not processing_emojis:
related_table="user_profile", id_field=True) re_map_foreign_keys_internal(records, 'records', 'user_profile_id',
related_table="user_profile", id_field=True)
for record in records: for record in records:
key = Key(bucket) key = Key(bucket)
@ -534,15 +535,19 @@ def import_uploads_s3(bucket_name: str, import_dir: Path, processing_avatars: bo
key.key = s3_file_name key.key = s3_file_name
path_maps['attachment_path'][record['s3_path']] = s3_file_name path_maps['attachment_path'][record['s3_path']] = s3_file_name
user_profile_id = int(record['user_profile_id']) # Exported custom emoji from tools like Slack don't have
# Support email gateway bot and other cross-realm messages # the data for what user uploaded them in `user_profile_id`.
if user_profile_id in id_maps["user_profile"]: if not processing_emojis:
logging.info("Uploaded by ID mapped user: %s!" % (user_profile_id,)) user_profile_id = int(record['user_profile_id'])
user_profile_id = id_maps["user_profile"][user_profile_id] # Support email gateway bot and other cross-realm messages
user_profile = get_user_profile_by_id(user_profile_id) if user_profile_id in id_maps["user_profile"]:
key.set_metadata("user_profile_id", str(user_profile.id)) logging.info("Uploaded by ID mapped user: %s!" % (user_profile_id,))
key.set_metadata("realm_id", str(user_profile.realm_id)) user_profile_id = id_maps["user_profile"][user_profile_id]
user_profile = get_user_profile_by_id(user_profile_id)
key.set_metadata("user_profile_id", str(user_profile.id))
key.set_metadata("orig_last_modified", record['last_modified']) key.set_metadata("orig_last_modified", record['last_modified'])
key.set_metadata("realm_id", str(record['realm_id']))
headers = {'Content-Type': record['content_type']} headers = {'Content-Type': record['content_type']}