From d0c6f1392b2fdb10b24052da651b6bedeb42c3c3 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Tue, 14 Feb 2023 10:27:24 +0200 Subject: [PATCH] feat: on create save domain for relay --- models.py | 2 ++ static/components/relay-details/relay-details.html | 12 ++++++++++++ views_api.py | 6 ++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/models.py b/models.py index 45f6b51..427afbc 100644 --- a/models.py +++ b/models.py @@ -87,6 +87,8 @@ class WalletSpec(Spec): class RelayPublicSpec(FilterSpec, EventSpec, StorageSpec, PaymentSpec): + domain: str = '' + @property def is_read_only_relay(self): self.free_storage_value == 0 and not self.is_paid_relay diff --git a/static/components/relay-details/relay-details.html b/static/components/relay-details/relay-details.html index 42ad9e5..a712085 100644 --- a/static/components/relay-details/relay-details.html +++ b/static/components/relay-details/relay-details.html @@ -57,6 +57,18 @@
+
+
Domain:
+
+ +
+
+
diff --git a/views_api.py b/views_api.py index 1260d23..2132dc2 100644 --- a/views_api.py +++ b/views_api.py @@ -1,7 +1,8 @@ from http import HTTPStatus from typing import List, Optional -from fastapi import Depends, WebSocket +from urllib.parse import urlparse +from fastapi import Depends, WebSocket, Request from fastapi.exceptions import HTTPException from loguru import logger from pydantic.types import UUID4 @@ -48,7 +49,7 @@ async def websocket_endpoint(relay_id: str, websocket: WebSocket): @nostrrelay_ext.post("/api/v1/relay") async def api_create_relay( - data: NostrRelay, wallet: WalletTypeInfo = Depends(require_admin_key) + data: NostrRelay, request: Request, wallet: WalletTypeInfo = Depends(require_admin_key) ) -> NostrRelay: if len(data.id): await check_admin(UUID4(wallet.wallet.user)) @@ -56,6 +57,7 @@ async def api_create_relay( data.id = urlsafe_short_hash()[:8] try: + data.config.domain = urlparse(str(request.url)).netloc relay = await create_relay(wallet.wallet.user, data) return relay