From 2dac04d1a41809b2df3b56e25e594ea32decb4d0 Mon Sep 17 00:00:00 2001 From: edraft Date: Tue, 11 Mar 2025 18:49:43 +0100 Subject: [PATCH] Loading-screen default false --- api/src/data/schemas/public/short_url.py | 3 +++ api/src/redirector.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/data/schemas/public/short_url.py b/api/src/data/schemas/public/short_url.py index c9ba579..5b04e65 100644 --- a/api/src/data/schemas/public/short_url.py +++ b/api/src/data/schemas/public/short_url.py @@ -29,6 +29,9 @@ class ShortUrl(DbModelABC): self._description = description self._group_id = group_id self._domain_id = domain_id + + if loading_screen is None or loading_screen == "": + loading_screen = False self._loading_screen = loading_screen @property diff --git a/api/src/redirector.py b/api/src/redirector.py index 67d9e05..6f11a03 100644 --- a/api/src/redirector.py +++ b/api/src/redirector.py @@ -164,7 +164,9 @@ async def _track_visit(r: Request, short_url: dict): def _get_redirect_url(url: str) -> str: - if not url.startswith("http://") and not url.startswith("https://"): + protocols = Environment.get("PROTOCOLS", list[str], ["http", "https"]) + + if not any(url.startswith(f"{protocol}://") for protocol in protocols): url = f"http://{url}" return url