From 9ccd94aae30273ac7feb6593f770934868e5b462 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Fri, 10 Feb 2023 13:39:38 +0200
Subject: [PATCH] feat: basic relay public info

---
 views.py     | 34 +++++++++++++++++++++++++---------
 views_api.py | 19 -------------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/views.py b/views.py
index de769f3..e68923d 100644
--- a/views.py
+++ b/views.py
@@ -1,9 +1,13 @@
+from http import HTTPStatus
+
 from fastapi import Depends, Request
+from fastapi.exceptions import HTTPException
 from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse
+from starlette.responses import HTMLResponse, JSONResponse
 
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists
+from lnbits.extensions.nostrrelay.crud import get_public_relay
 
 from . import nostrrelay_ext, nostrrelay_renderer
 
@@ -17,13 +21,25 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
     )
 
 
-@nostrrelay_ext.get("/public")
-async def nostrrelay(request: Request, nostrrelay_id):
+@nostrrelay_ext.get("/{relay_id}")
+async def nostrrelay(request: Request, relay_id: str):
+    relay_public_data = await get_public_relay(relay_id)
+    if not relay_public_data:
+        raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Cannot find relay",
+            )
+
+    if request.headers.get("accept") == "application/nostr+json":
+        return JSONResponse(
+            content=relay_public_data,
+            headers={
+                "Access-Control-Allow-Origin": "*",
+                "Access-Control-Allow-Headers": "*",
+                "Access-Control-Allow-Methods": "GET",
+            },
+        )
+
     return nostrrelay_renderer().TemplateResponse(
-        "nostrrelay/public.html",
-        {
-            "request": request,
-            # "nostrrelay": relay,
-            "web_manifest": f"/nostrrelay/manifest/{nostrrelay_id}.webmanifest",
-        },
+        "nostrrelay/public.html", {"request": request, "relay": relay_public_data}
     )
diff --git a/views_api.py b/views_api.py
index a41fe85..f883b77 100644
--- a/views_api.py
+++ b/views_api.py
@@ -45,25 +45,6 @@ async def websocket_endpoint(relay_id: str, websocket: WebSocket):
         client_manager.remove_client(client)
 
 
-@nostrrelay_ext.get("/{relay_id}", status_code=HTTPStatus.OK)
-async def api_nostrrelay_info(relay_id: str):
-    relay = await get_public_relay(relay_id)
-    if not relay:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail="Relay not found",
-        )
-
-    return JSONResponse(
-        content=relay,
-        headers={
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Headers": "*",
-            "Access-Control-Allow-Methods": "GET",
-        },
-    )
-
-
 @nostrrelay_ext.post("/api/v1/relay")
 async def api_create_relay(
     data: NostrRelay, wallet: WalletTypeInfo = Depends(require_admin_key)