From 48efd46bc6cd208de16eef693f44cf481732ae5d Mon Sep 17 00:00:00 2001 From: Pragati Agrawal Date: Mon, 19 Aug 2019 23:16:45 +0530 Subject: [PATCH] realm_logo: Remove redundant `realm_logo_url` function. This function is nothing but a redundant layer of call to `get_realm_logo_url`. --- zerver/lib/events.py | 6 +++--- zerver/lib/realm_logo.py | 7 ++----- zerver/tests/test_upload.py | 8 ++++---- zerver/views/realm_logo.py | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/zerver/lib/events.py b/zerver/lib/events.py index 92968c79e6..35090ff80d 100644 --- a/zerver/lib/events.py +++ b/zerver/lib/events.py @@ -31,7 +31,7 @@ from zerver.lib.narrow import check_supported_events_narrow_filter, read_stop_wo from zerver.lib.push_notifications import push_notifications_enabled from zerver.lib.soft_deactivation import reactivate_user_if_soft_deactivated from zerver.lib.realm_icon import realm_icon_url -from zerver.lib.realm_logo import realm_logo_url +from zerver.lib.realm_logo import get_realm_logo_url from zerver.lib.request import JsonableError from zerver.lib.stream_subscription import handle_stream_notifications_compatibility from zerver.lib.topic import TOPIC_NAME @@ -117,9 +117,9 @@ def get_raw_user_data(realm: Realm, client_gravatar: bool) -> Dict[int, Dict[str } def add_realm_logo_fields(state: Dict[str, Any], realm: Realm) -> None: - state['realm_logo_url'] = realm_logo_url(realm, night = False) + state['realm_logo_url'] = get_realm_logo_url(realm, night = False) state['realm_logo_source'] = realm.logo_source - state['realm_night_logo_url'] = realm_logo_url(realm, night = True) + state['realm_night_logo_url'] = get_realm_logo_url(realm, night = True) state['realm_night_logo_source'] = realm.night_logo_source state['max_logo_file_size'] = settings.MAX_LOGO_FILE_SIZE diff --git a/zerver/lib/realm_logo.py b/zerver/lib/realm_logo.py index cddd86e82d..6c3eac83ea 100644 --- a/zerver/lib/realm_logo.py +++ b/zerver/lib/realm_logo.py @@ -5,9 +5,6 @@ from django.conf import settings from zerver.lib.upload import upload_backend from zerver.models import Realm -def realm_logo_url(realm: Realm, night: bool) -> str: - return get_realm_logo_url(realm, night) - def get_realm_logo_url(realm: Realm, night: bool) -> str: if night: logo_source = realm.night_logo_source @@ -21,7 +18,7 @@ def get_realm_logo_url(realm: Realm, night: bool) -> str: def get_realm_logo_data(realm: Realm, night: bool) -> Dict[str, Any]: if night: - return dict(night_logo_url=realm_logo_url(realm, night), + return dict(night_logo_url=get_realm_logo_url(realm, night), night_logo_source=realm.night_logo_source) - return dict(logo_url=realm_logo_url(realm, night), + return dict(logo_url=get_realm_logo_url(realm, night), logo_source=realm.logo_source) diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py index ce6d5348fb..39131da15b 100644 --- a/zerver/tests/test_upload.py +++ b/zerver/tests/test_upload.py @@ -10,7 +10,7 @@ from zerver.lib.avatar import ( from zerver.lib.avatar_hash import user_avatar_path from zerver.lib.bugdown import url_filename from zerver.lib.realm_icon import realm_icon_url -from zerver.lib.realm_logo import realm_logo_url +from zerver.lib.realm_logo import get_realm_logo_url from zerver.lib.test_classes import ZulipTestCase, UploadSerializeMixin from zerver.lib.test_helpers import ( avatar_disk_path, @@ -1296,7 +1296,7 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase): do_change_logo_source(realm, Realm.LOGO_UPLOADED, self.night) response = self.client_get("/json/realm/logo", {'night': ujson.dumps(self.night)}) redirect_url = response['Location'] - self.assertEqual(redirect_url, realm_logo_url(realm, self.night) + + self.assertEqual(redirect_url, get_realm_logo_url(realm, self.night) + '&night=%s' % (str(self.night).lower(),)) def test_get_realm_logo(self) -> None: @@ -1305,7 +1305,7 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase): do_change_logo_source(realm, Realm.LOGO_UPLOADED, self.night) response = self.client_get("/json/realm/logo", {'night': ujson.dumps(self.night)}) redirect_url = response['Location'] - self.assertTrue(redirect_url.endswith(realm_logo_url(realm, self.night) + + self.assertTrue(redirect_url.endswith(get_realm_logo_url(realm, self.night) + '&night=%s' % (str(self.night).lower(),))) def test_valid_logos(self) -> None: @@ -1321,7 +1321,7 @@ class RealmLogoTest(UploadSerializeMixin, ZulipTestCase): result = self.client_post("/json/realm/logo", {'file': fp, 'night': ujson.dumps(self.night)}) realm = get_realm('zulip') self.assert_json_success(result) - logo_url = realm_logo_url(realm, self.night) + logo_url = get_realm_logo_url(realm, self.night) if rfname is not None: response = self.client_get(logo_url) diff --git a/zerver/views/realm_logo.py b/zerver/views/realm_logo.py index 652104875e..7812505fc3 100644 --- a/zerver/views/realm_logo.py +++ b/zerver/views/realm_logo.py @@ -7,7 +7,7 @@ from zerver.lib.validator import check_bool from zerver.lib.request import REQ, has_request_variables from zerver.decorator import require_realm_admin from zerver.lib.actions import do_change_logo_source -from zerver.lib.realm_logo import realm_logo_url +from zerver.lib.realm_logo import get_realm_logo_url from zerver.lib.response import json_error, json_success from zerver.lib.upload import upload_logo_image from zerver.models import Realm, UserProfile @@ -43,7 +43,7 @@ def delete_logo_backend(request: HttpRequest, user_profile: UserProfile, @has_request_variables def get_logo_backend(request: HttpRequest, user_profile: UserProfile, night: bool=REQ(validator=check_bool)) -> HttpResponse: - url = realm_logo_url(user_profile.realm, night) + url = get_realm_logo_url(user_profile.realm, night) # We can rely on the url already having query parameters. Because # our templates depend on being able to use the ampersand to