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

upload: Fix ensure_medium_avatar_image for S3 backend. 

Previously, it tried to interact with the wrong path for the original
image.
This commit is contained in:
Tim Abbott 2018-11-26 20:20:27 -08:00
parent 00826486bd
commit 3bb0956046
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/upload.py
View File

@ -431,7 +431,7 @@ class S3UploadBackend(ZulipUploadBackend):
bucket_name = settings.S3_AVATAR_BUCKET bucket_name = settings.S3_AVATAR_BUCKET
conn = S3Connection(settings.S3_KEY, settings.S3_SECRET_KEY) conn = S3Connection(settings.S3_KEY, settings.S3_SECRET_KEY)
bucket = get_bucket(conn, bucket_name) bucket = get_bucket(conn, bucket_name)
key = bucket.get_key(file_path) key = bucket.get_key(file_path + ".original")
image_data = key.get_contents_as_string() image_data = key.get_contents_as_string()
resized_medium = resize_avatar(image_data, MEDIUM_AVATAR_SIZE) # type: ignore # image_data is `bytes`, boto subs are wrong resized_medium = resize_avatar(image_data, MEDIUM_AVATAR_SIZE) # type: ignore # image_data is `bytes`, boto subs are wrong