paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 12:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Remove unused get_realm_for_filename.

Browse Source
This commit is contained in:
Tim Abbott
2020-06-18 16:45:28 -07:00
committed by Tim Abbott
parent 5962d1ea14
commit 0b6ebb4fbb
2 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zerver/lib/upload.py
View File

@@ -32,14 +32,7 @@ from PIL.Image import DecompressionBombError
from zerver.lib.avatar_hash import user_avatar_path
from zerver.lib.exceptions import ErrorCode, JsonableError
from zerver.lib.utils import generate_random_token
from zerver.models import (
Attachment,
Message,
Realm,
RealmEmoji,
UserProfile,
get_user_profile_by_id,
)
from zerver.models import Attachment, Message, Realm, RealmEmoji, UserProfile
DEFAULT_AVATAR_SIZE = 100
MEDIUM_AVATAR_SIZE = 500
@@ -339,17 +332,6 @@ def get_signed_upload_url(path: str) -> str:
ExpiresIn=SIGNED_UPLOAD_URL_DURATION,
HttpMethod='GET')
def get_realm_for_filename(path: str) -> Optional[int]:
session = boto3.Session(settings.S3_KEY, settings.S3_SECRET_KEY)
bucket = get_bucket(session, settings.S3_AUTH_UPLOADS_BUCKET)
key = bucket.Object(path)
try:
user_profile_id = key.metadata['user_profile_id']
except botocore.exceptions.ClientError:
return None
return get_user_profile_by_id(user_profile_id).realm_id
class S3UploadBackend(ZulipUploadBackend):
def __init__(self) -> None:
self.session = boto3.Session(settings.S3_KEY, settings.S3_SECRET_KEY)