From 9a010aa97b2af095372671075b70f9085ba48dfb Mon Sep 17 00:00:00 2001 From: Haydar Ghasemi Date: Sat, 9 May 2026 14:12:13 +0330 Subject: [PATCH] FIX(notifications): configuration for GOTIFY_BASE_PUBLIC_URL configuration for GOTIFY_BASE_PUBLIC_URL --- README.srt | 2 +- main/settings.py | 1 + utils/clients/gotify.py | 9 +++++---- utils/clients/openapi.json | 2 +- utils/clients/openapi.yaml | 6 +++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.srt b/README.srt index 238d2d1..eb68967 100644 --- a/README.srt +++ b/README.srt @@ -1,4 +1,4 @@ openapi-python-client -https://push.gooyal.com/swagger?base=push.gooyal.com +https://push.gooyal.ir/swagger?base=push.gooyal.ir npm install -g swagger2openapi \ No newline at end of file diff --git a/main/settings.py b/main/settings.py index 2f698c8..dcc70b3 100644 --- a/main/settings.py +++ b/main/settings.py @@ -236,6 +236,7 @@ JALALI_DATE_DEFAULTS = { } REDIS_BASE_URL = config('REDIS_BASE_URL') GOTIFY_ADMIN_CLIENT_TOKEN = config('GOTIFY_ADMIN_CLIENT_TOKEN') +GOTIFY_BASE_PUBLIC_URL = config('GOTIFY_BASE_PUBLIC_URL') CACHES = { "default": { diff --git a/utils/clients/gotify.py b/utils/clients/gotify.py index 69dd3a9..20786da 100644 --- a/utils/clients/gotify.py +++ b/utils/clients/gotify.py @@ -19,6 +19,7 @@ from gotify_rest_api_client.api.application import create_app from gotify_rest_api_client.types import Unset ADMIN_CLIENT_TOKEN = settings.GOTIFY_ADMIN_CLIENT_TOKEN +GOTIFY_BASE_PUBLIC_URL = settings.GOTIFY_BASE_PUBLIC_URL import logging @@ -44,7 +45,7 @@ def log_response(response): def get_client(access_token): - client = AuthenticatedClient(base_url="https://push.gooyal.com", token=access_token, + client = AuthenticatedClient(base_url=GOTIFY_BASE_PUBLIC_URL, token=access_token, httpx_args={"event_hooks": {"request": [log_request], "response": [log_response]}}, ) return client @@ -54,12 +55,12 @@ def get_basic_client(username, password): auth = httpx.BasicAuth(username=username, password=password) prefix, token = auth._auth_header.split() - # httpx_client = httpx.Client(auth=auth, base_url="https://push.gooyal.com") - client = AuthenticatedClient(base_url="https://push.gooyal.com", token=token, prefix=prefix, + # httpx_client = httpx.Client(auth=auth, base_url=GOTIFY_BASE_PUBLIC_URL) + client = AuthenticatedClient(base_url=GOTIFY_BASE_PUBLIC_URL, token=token, prefix=prefix, httpx_args={ "event_hooks": {"request": [log_request], "response": [log_response]}, # "auth": auth, - # "base_url": "https://push.gooyal.com" + # "base_url": GOTIFY_BASE_PUBLIC_URL } ) # client.set_httpx_client(httpx_client) diff --git a/utils/clients/openapi.json b/utils/clients/openapi.json index 12045c1..5bb0aca 100644 --- a/utils/clients/openapi.json +++ b/utils/clients/openapi.json @@ -19,7 +19,7 @@ }, "version": "2.0.2" }, - "host": "push.gooyal.com", + "host": "push.gooyal.ir", "paths": { "/application": { "get": { diff --git a/utils/clients/openapi.yaml b/utils/clients/openapi.yaml index 478cc55..7a59a7b 100644 --- a/utils/clients/openapi.yaml +++ b/utils/clients/openapi.yaml @@ -1,6 +1,6 @@ openapi: 3.0.0 x-origin: - - url: https://push.gooyal.com/swagger?base=push.gooyal.com%2F + - url: https://push.gooyal.ir/swagger?base=push.gooyal.ir%2F format: swagger version: "2.0" converter: @@ -1452,8 +1452,8 @@ paths: schema: $ref: "#/components/schemas/VersionInfo" servers: - - url: http://push.gooyal.com/ - - url: https://push.gooyal.com/ + - url: http://push.gooyal.ir/ + - url: https://push.gooyal.ir/ components: securitySchemes: appTokenAuthorizationHeader: