mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 13:03:29 +00:00
avatar: Remove unnecessary try...except statement.
The `RateLimited` exception can be caught by `JsonErrorHandler`, so it is not necessary to have the try...except statement here. It is also invalid to pass a string to initialize `RateLimited`. Signed-off-by: Zixuan James Li <p359101898@gmail.com>
This commit is contained in:
committed by
Tim Abbott
parent
ad17096c9c
commit
43106fb6ce
@@ -42,12 +42,11 @@ from zerver.lib.exceptions import (
|
||||
MissingAuthenticationError,
|
||||
OrganizationAdministratorRequired,
|
||||
OrganizationOwnerRequired,
|
||||
RateLimited,
|
||||
)
|
||||
from zerver.lib.integrations import EMBEDDED_BOTS
|
||||
from zerver.lib.rate_limiter import rate_limit_spectator_attachment_access_by_file
|
||||
from zerver.lib.request import REQ, has_request_variables
|
||||
from zerver.lib.response import json_response_from_error, json_success
|
||||
from zerver.lib.response import json_success
|
||||
from zerver.lib.streams import access_stream_by_id, access_stream_by_name, subscribed_to_stream
|
||||
from zerver.lib.types import ProfileDataElementUpdateDict, ProfileDataElementValue, Validator
|
||||
from zerver.lib.upload import upload_avatar_image
|
||||
@@ -260,13 +259,8 @@ def avatar(
|
||||
raise MissingAuthenticationError()
|
||||
|
||||
if settings.RATE_LIMITING:
|
||||
try:
|
||||
unique_avatar_key = f"{realm.id}/{email_or_id}/{medium}"
|
||||
rate_limit_spectator_attachment_access_by_file(unique_avatar_key)
|
||||
except RateLimited:
|
||||
return json_response_from_error(
|
||||
RateLimited(_("Too many attempts, please try after some time."))
|
||||
)
|
||||
unique_avatar_key = f"{realm.id}/{email_or_id}/{medium}"
|
||||
rate_limit_spectator_attachment_access_by_file(unique_avatar_key)
|
||||
else:
|
||||
realm = maybe_user_profile.realm
|
||||
|
||||
|
||||
Reference in New Issue
Block a user