From 5339dde64a6a89a2727247d99bdf087dbb6687e2 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Wed, 8 Feb 2023 11:40:42 +0200 Subject: [PATCH] fix: revert `NostrClientManager`init place --- __init__.py | 3 +-- views_api.py | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/__init__.py b/__init__.py index ef02bed..18687e4 100644 --- a/__init__.py +++ b/__init__.py @@ -22,12 +22,11 @@ def nostrrelay_renderer(): return template_renderer(["lnbits/extensions/nostrrelay/templates"]) -from .client_manager import NostrClientManager from .models import NostrRelay from .views import * # noqa from .views_api import * # noqa -client_manager = NostrClientManager() + settings.lnbits_relay_information = { "name": "LNbits Nostr Relay", diff --git a/views_api.py b/views_api.py index f45c11a..5ffb88c 100644 --- a/views_api.py +++ b/views_api.py @@ -16,7 +16,7 @@ from lnbits.decorators import ( from lnbits.helpers import urlsafe_short_hash from . import client_manager, nostrrelay_ext -from .client_manager import NostrClientConnection +from .client_manager import NostrClientConnection, NostrClientManager from .crud import ( create_relay, delete_all_events, @@ -28,11 +28,13 @@ from .crud import ( ) from .models import NostrRelay +client_manager = NostrClientManager() @nostrrelay_ext.websocket("/{relay_id}") async def websocket_endpoint(relay_id: str, websocket: WebSocket): client = NostrClientConnection(relay_id=relay_id, websocket=websocket) - if not (await client_manager.add_client(client)): + client_accepted = await client_manager.add_client(client) + if not client_accepted: return try: