diff --git a/__init__.py b/__init__.py index c95847e..5df0dec 100644 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,3 @@ -import asyncio - from fastapi import APIRouter from fastapi.staticfiles import StaticFiles diff --git a/crud.py b/crud.py index 6354243..c3cf061 100644 --- a/crud.py +++ b/crud.py @@ -1,5 +1,4 @@ import json -import re from typing import Any, List, Optional from . import db @@ -31,7 +30,6 @@ async def create_event(relay_id: str, e: NostrEvent): await create_event_tags(relay_id, e.id, name, value, extra) - async def get_events(relay_id: str, filter: NostrFilter) -> List[NostrEvent]: values: List[Any] = [] query = "SELECT id, pubkey, created_at, kind, content, sig FROM nostrrelay.events" @@ -41,7 +39,7 @@ async def get_events(relay_id: str, filter: NostrFilter) -> List[NostrEvent]: values += filter.e e_s = ",".join(["?"] * len(filter.e)) query += f" nostrrelay.event_tags.value in ({e_s}) AND nostrrelay.event_tags.name = 'e'" - + if len(filter.p): values += filter.p p_s = ",".join(["?"] * len(filter.p)) @@ -50,9 +48,9 @@ async def get_events(relay_id: str, filter: NostrFilter) -> List[NostrEvent]: query += " AND nostrrelay.events.relay_id = ?" else: query += " WHERE nostrrelay.events.relay_id = ?" - + values.append(relay_id) - + if len(filter.ids) != 0: ids = ",".join(["?"] * len(filter.ids)) query += f" AND id IN ({ids})" @@ -66,10 +64,10 @@ async def get_events(relay_id: str, filter: NostrFilter) -> List[NostrEvent]: query += f" AND kind IN ({kinds})" values += filter.kinds if filter.since: - query += f" AND created_at >= ?" + query += " AND created_at >= ?" values += [filter.since] if filter.until: - query += f" AND created_at <= ?" + query += " AND created_at <= ?" values += [filter.until] query += " ORDER BY created_at DESC" @@ -87,7 +85,6 @@ async def get_events(relay_id: str, filter: NostrFilter) -> List[NostrEvent]: return events - async def create_event_tags( relay_id: str, event_id: str, tag_name: str, tag_value: str, extra_values: Optional[str] ): @@ -105,6 +102,7 @@ async def create_event_tags( (relay_id, event_id, tag_name, tag_value, extra_values), ) + async def get_event_tags( relay_id: str, event_id: str ) -> List[List[str]]: @@ -122,4 +120,3 @@ async def get_event_tags( tags.append(tag) return tags - diff --git a/models.py b/models.py index 435c6e9..746b802 100644 --- a/models.py +++ b/models.py @@ -109,7 +109,6 @@ class NostrFilter(BaseModel): return False - class NostrEventType(str, Enum): EVENT = "EVENT" REQ = "REQ" diff --git a/views.py b/views.py index 5d66220..de769f3 100644 --- a/views.py +++ b/views.py @@ -1,8 +1,5 @@ -from http import HTTPStatus - from fastapi import Depends, Request from fastapi.templating import Jinja2Templates -from starlette.exceptions import HTTPException from starlette.responses import HTMLResponse from lnbits.core.models import User diff --git a/views_api.py b/views_api.py index 78bdd46..7a86995 100644 --- a/views_api.py +++ b/views_api.py @@ -1,10 +1,7 @@ from http import HTTPStatus -from fastapi import Depends, Query, WebSocket +from fastapi import Query, WebSocket from loguru import logger -from starlette.exceptions import HTTPException - -from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key from . import nostrrelay_ext from .client_manager import NostrClientConnection, NostrClientManager