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

Refactor: Change upload_avatar_image to accept two user profiles.

Browse Source 
In this commit we just change the upload_avatar_image function to accept
two user_profiles acting_user_profile and target_user_profile. Basically
email param is dropped for a target_user_profile so that avatar's could
be moved lateron to user id based storage.
This commit is contained in:
adnrs96
2017-03-02 20:51:46 +05:30
committed by Tim Abbott
parent 9ba0db29e4
commit 9eb47f108c
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zerver/lib/upload.py
View File

@@ -103,8 +103,8 @@ class ZulipUploadBackend(object):
# type: (Text, int, Optional[Text], binary_type, UserProfile, Optional[Realm]) -> Text
raise NotImplementedError()
def upload_avatar_image(self, user_file, user_profile, email):
# type: (File, UserProfile, Text) -> None
def upload_avatar_image(self, user_file, acting_user_profile, target_user_profile):
# type: (File, UserProfile, UserProfile) -> None
raise NotImplementedError()
def delete_message_image(self, path_id):
@@ -239,18 +239,18 @@ class S3UploadBackend(ZulipUploadBackend):
logging.warning("%s does not exist. Its entry in the database will be removed." % (file_name,))
return False
def upload_avatar_image(self, user_file, user_profile, email):
# type: (File, UserProfile, Text) -> None
def upload_avatar_image(self, user_file, acting_user_profile, target_user_profile):
# type: (File, UserProfile, UserProfile) -> None
content_type = guess_type(user_file.name)[0]
bucket_name = settings.S3_AVATAR_BUCKET
s3_file_name = user_avatar_hash(email)
s3_file_name = user_avatar_hash(target_user_profile.email)
image_data = user_file.read()
upload_image_to_s3(
bucket_name,
s3_file_name + ".original",
content_type,
user_profile,
target_user_profile,
image_data,
)
@@ -260,7 +260,7 @@ class S3UploadBackend(ZulipUploadBackend):
bucket_name,
s3_file_name + "-medium.png",
"image/png",
user_profile,
target_user_profile,
resized_medium
)
@@ -269,7 +269,7 @@ class S3UploadBackend(ZulipUploadBackend):
bucket_name,
s3_file_name,
'image/png',
user_profile,
target_user_profile,
resized_data,
)
# See avatar_url in avatar.py for URL. (That code also handles the case
@@ -386,9 +386,9 @@ class LocalUploadBackend(ZulipUploadBackend):
logging.warning("%s does not exist. Its entry in the database will be removed." % (file_name,))
return False
def upload_avatar_image(self, user_file, user_profile, email):
# type: (File, UserProfile, Text) -> None
email_hash = user_avatar_hash(email)
def upload_avatar_image(self, user_file, acting_user_profile, target_user_profile):
# type: (File, UserProfile, UserProfile) -> None
email_hash = user_avatar_hash(target_user_profile.email)
image_data = user_file.read()
write_local_file('avatars', email_hash+'.original', image_data)
@@ -446,9 +446,9 @@ def delete_message_image(path_id):
# type: (Text) -> bool
return upload_backend.delete_message_image(path_id)
def upload_avatar_image(user_file, user_profile, email):
# type: (File, UserProfile, Text) -> None
upload_backend.upload_avatar_image(user_file, user_profile, email)
def upload_avatar_image(user_file, acting_user_profile, target_user_profile):
# type: (File, UserProfile, UserProfile) -> None
upload_backend.upload_avatar_image(user_file, acting_user_profile, target_user_profile)
def upload_icon_image(user_file, user_profile):
# type: (File, UserProfile) -> None