avatar: Bug fixes and cleanups. #37185
Open
+23
−19
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
Making a call to `DELETE users/me/avatar` when avatar_source is already gravatar resulted in increasing avatar_version, creating realmauditlog, and sending an event to clients. This commit makes changes to avoid doing so. Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
In `build_avatar_url`, a possible combination for integration bot was: * avatar_url = slack image url * avatar_source = UserProfile.AVATAR_FROM_GRAVATAR Currently, avatar_url returned by this function is not used if avatar_source is gravatar. So, this doesn't cause a bug. But it is incorrect logically, and can cause bug in future. This commit makes improvement to set avatar_url = None when avatar_source is gravatar. The url is set only if avatar_source is UserProfile.AVATAR_FROM_USER. Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
`do_delete_avatar_image` was only used in `do_scrub_realm`, it's not intended to be used in delete_avatar_backend (`POST /users/me/avatar`). The difference between the two is just changing the avatar_source vs changing avatar_source as well as deleting the image from storage. This commit renames `do_delete_avatar_image` to `do_scrub_avatar_image` for clarity. Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
While scrubbing a realm, there's no need to attempt sending an event to clients for avatar fields change. In `do_scrub_avatar_image` we were doing so. Signed-off-by: Prakhar Pratyush <prakhar@zulip.com>
34e51a3 to
f2e8622
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes improvements in the avatar codepath I noticed, while working on Jdenticon PR.
See commit messages for details.
Self-review checklist
(variable names, code reuse, readability, etc.).
Communicate decisions, questions, and potential concerns.
Individual commits are ready for review (see commit discipline).
Completed manual review and testing of the following: