refactor: extract nostr to __init__

This commit is contained in:
Vlad Stan 2023-06-23 11:15:57 +03:00
parent e35dafe056
commit 99022f2b4a
4 changed files with 12 additions and 10 deletions

View file

@ -8,6 +8,8 @@ from lnbits.db import Database
from lnbits.helpers import template_renderer from lnbits.helpers import template_renderer
from lnbits.tasks import catch_everything_and_restart from lnbits.tasks import catch_everything_and_restart
from .nostr.client.client import NostrClient as NostrClientLib
db = Database("ext_nostrclient") db = Database("ext_nostrclient")
nostrclient_static_files = [ nostrclient_static_files = [
@ -22,6 +24,13 @@ nostrclient_ext: APIRouter = APIRouter(prefix="/nostrclient", tags=["nostrclient
scheduled_tasks: List[asyncio.Task] = [] scheduled_tasks: List[asyncio.Task] = []
class NostrClient:
def __init__(self):
self.client: NostrClientLib = NostrClientLib(connect=False)
nostr = NostrClient()
def nostr_renderer(): def nostr_renderer():
return template_renderer(["lnbits/extensions/nostrclient/templates"]) return template_renderer(["lnbits/extensions/nostrclient/templates"])

View file

@ -7,21 +7,13 @@ from loguru import logger
from lnbits.helpers import urlsafe_short_hash from lnbits.helpers import urlsafe_short_hash
from . import nostr
from .models import Event, Filter from .models import Event, Filter
from .nostr.client.client import NostrClient as NostrClientLib
from .nostr.filter import Filter as NostrFilter from .nostr.filter import Filter as NostrFilter
from .nostr.filter import Filters as NostrFilters from .nostr.filter import Filters as NostrFilters
from .nostr.message_pool import EndOfStoredEventsMessage, NoticeMessage from .nostr.message_pool import EndOfStoredEventsMessage, NoticeMessage
class NostrClient:
def __init__(self):
self.client: NostrClientLib = NostrClientLib(connect=False)
nostr = NostrClient()
class NostrRouter: class NostrRouter:
received_subscription_events: dict[str, list[Event]] = {} received_subscription_events: dict[str, list[Event]] = {}

View file

@ -1,6 +1,7 @@
import asyncio import asyncio
import threading import threading
from . import nostr
from .crud import get_relays from .crud import get_relays
from .nostr.message_pool import EndOfStoredEventsMessage, EventMessage, NoticeMessage from .nostr.message_pool import EndOfStoredEventsMessage, EventMessage, NoticeMessage
from .services import NostrRouter, nostr from .services import NostrRouter, nostr

View file

@ -9,7 +9,7 @@ from starlette.exceptions import HTTPException
from lnbits.decorators import check_admin from lnbits.decorators import check_admin
from lnbits.helpers import urlsafe_short_hash from lnbits.helpers import urlsafe_short_hash
from . import nostrclient_ext, scheduled_tasks from . import nostr, nostrclient_ext, scheduled_tasks
from .crud import add_relay, delete_relay, get_relays from .crud import add_relay, delete_relay, get_relays
from .helpers import normalize_public_key from .helpers import normalize_public_key
from .models import Relay, RelayList, TestMessage, TestMessageResponse from .models import Relay, RelayList, TestMessage, TestMessageResponse