diff --git a/views_api.py b/views_api.py
index abdc1ef..a81967f 100644
--- a/views_api.py
+++ b/views_api.py
@@ -14,10 +14,11 @@ from fastapi import (
)
from lnbits.core.crud import get_user
from lnbits.core.crud.wallets import get_wallet
-from lnbits.core.models import WalletTypeInfo
+from lnbits.core.models import Account, WalletTypeInfo
from lnbits.core.models.payments import CreateInvoice
from lnbits.core.services import create_payment_request
from lnbits.decorators import (
+ check_admin,
require_admin_key,
require_invoice_key,
)
@@ -35,18 +36,25 @@ from .crud import (
delete_event,
delete_event_tickets,
delete_ticket,
+ get_all_events,
get_event,
+ get_event_tickets,
get_events,
+ get_pending_events,
+ get_public_events,
+ get_settings,
get_ticket,
get_tickets,
purge_unpaid_tickets,
update_event,
+ update_settings,
update_ticket,
)
from .models import (
CreateEvent,
CreateTicket,
Event,
+ EventsSettings,
PublicEvent,
PublicTicket,
Ticket,
@@ -63,31 +71,87 @@ def _is_fiat_currency(currency: str | None) -> bool:
return str(currency or "").lower() not in {"sat", "sats"}
+# Literal-prefix routes (/public, /all, /pending, /settings) MUST be declared
+# before any "/{event_id}" route or FastAPI matches them as a path parameter.
+
+
@events_api_router.get("")
async def api_events(
all_wallets: bool = Query(False),
wallet: WalletTypeInfo = Depends(require_invoice_key),
) -> list[Event]:
wallet_ids = [wallet.wallet.id]
-
if all_wallets:
user = await get_user(wallet.wallet.user)
wallet_ids = user.wallet_ids if user else []
-
return await get_events(wallet_ids)
+@events_api_router.get("/public")
+async def api_events_public() -> list[Event]:
+ """Approved, non-canceled events for an anonymous public listing."""
+ return await get_public_events()
+
+
+@events_api_router.get("/all")
+async def api_events_all(
+ admin: Account = Depends(check_admin),
+) -> list[Event]:
+ """All events across all wallets. LNbits admin only."""
+ return await get_all_events()
+
+
+@events_api_router.get("/pending")
+async def api_events_pending(
+ admin: Account = Depends(check_admin),
+) -> list[Event]:
+ """Proposed events awaiting admin approval. LNbits admin only."""
+ return await get_pending_events()
+
+
+@events_api_router.get("/settings")
+async def api_get_settings(
+ admin: Account = Depends(check_admin),
+) -> EventsSettings:
+ return await get_settings()
+
+
+@events_api_router.put("/settings")
+async def api_update_settings(
+ data: EventsSettings,
+ admin: Account = Depends(check_admin),
+) -> EventsSettings:
+ return await update_settings(data)
+
+
@events_api_router.get("/{event_id}", response_model=PublicEvent)
async def api_get_event(event_id: str) -> Event:
+ """Public event detail used by display.vue.
+
+ For approved events we run the upstream sold-out / closing-window /
+ conditional gates. For non-approved events (proposed / rejected) we
+ return the trimmed PublicEvent with status set so the SFC can render
+ the pending-approval banner without a separate request.
+ """
event = await get_event(event_id)
if not event:
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
)
+
+ if event.status != "approved":
+ # Proposed/rejected events are not yet ticketable; skip ticket gates.
+ return event
+
await purge_unpaid_tickets(event_id)
+ # closing_date is filled in by create_event (defaults to end_date or
+ # start_date) but the field is typed Optional, so guard for the typechecker.
+ closing_date = (
+ event.closing_date or event.event_end_date or event.event_start_date
+ )
is_window_open = datetime.now(timezone.utc) < datetime.strptime(
- event.closing_date, "%Y-%m-%d"
+ closing_date, "%Y-%m-%d"
).replace(tzinfo=timezone.utc)
is_min_tickets_met = (
event.sold >= event.extra.min_tickets if event.extra.conditional else True
@@ -98,7 +162,6 @@ async def api_get_event(event_id: str) -> Event:
event.canceled = True
await update_event(event)
await refund_tickets(event_id)
-
raise HTTPException(status_code=HTTPStatus.GONE, detail="Event canceled.")
if not is_window_open:
@@ -110,30 +173,50 @@ async def api_get_event(event_id: str) -> Event:
@events_api_router.post("")
-@events_api_router.put("/{event_id}")
async def api_event_create(
data: CreateEvent,
- wallet: WalletTypeInfo = Depends(require_admin_key),
- event_id: str | None = None,
+ wallet: WalletTypeInfo = Depends(require_invoice_key),
) -> Event:
- if event_id:
- event = await get_event(event_id)
- if not event:
- raise HTTPException(
- status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
- )
+ """Create a new event.
- if event.wallet != wallet.wallet.id:
- raise HTTPException(
- status_code=HTTPStatus.FORBIDDEN, detail="Not your event."
- )
- for k, v in data.dict().items():
- setattr(event, k, v)
- event = await update_event(event)
- else:
- event = await create_event(data)
+ Anyone with a wallet invoice key can submit. Non-LNbits-admins land in
+ `proposed` status unless `auto_approve` is enabled in extension settings.
+ """
+ if not data.wallet:
+ data.wallet = wallet.wallet.id
- return event
+ from lnbits.settings import settings
+
+ ext_settings = await get_settings()
+ user_id = wallet.wallet.user
+ is_admin = (
+ user_id == settings.super_user
+ or user_id in settings.lnbits_admin_users
+ )
+ if not is_admin and not ext_settings.auto_approve:
+ data.status = "proposed"
+
+ return await create_event(data)
+
+
+@events_api_router.put("/{event_id}")
+async def api_event_update(
+ event_id: str,
+ data: CreateEvent,
+ wallet: WalletTypeInfo = Depends(require_admin_key),
+) -> Event:
+ event = await get_event(event_id)
+ if not event:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
+ )
+ if event.wallet != wallet.wallet.id:
+ raise HTTPException(
+ status_code=HTTPStatus.FORBIDDEN, detail="Not your event."
+ )
+ for k, v in data.dict().items():
+ setattr(event, k, v)
+ return await update_event(event)
@events_api_router.put("/{event_id}/cancel")
@@ -146,13 +229,11 @@ async def api_event_cancel(
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
)
-
if event.wallet != wallet.wallet.id:
raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Not your event.")
event.canceled = True
event = await update_event(event)
await refund_tickets(event.id)
-
return event
@@ -165,14 +246,58 @@ async def api_form_delete(
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
)
-
if event.wallet != wallet.wallet.id:
raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Not your event.")
-
await delete_event(event_id)
await delete_event_tickets(event_id)
+@events_api_router.put("/{event_id}/approve")
+async def api_event_approve(
+ event_id: str,
+ admin: Account = Depends(check_admin),
+) -> Event:
+ event = await get_event(event_id)
+ if not event:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
+ )
+ if event.status != "proposed":
+ raise HTTPException(
+ status_code=HTTPStatus.BAD_REQUEST,
+ detail=f"Event is already {event.status}.",
+ )
+ event.status = "approved"
+ return await update_event(event)
+
+
+@events_api_router.put("/{event_id}/reject")
+async def api_event_reject(
+ event_id: str,
+ admin: Account = Depends(check_admin),
+) -> Event:
+ event = await get_event(event_id)
+ if not event:
+ raise HTTPException(
+ status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
+ )
+ if event.status != "proposed":
+ raise HTTPException(
+ status_code=HTTPStatus.BAD_REQUEST,
+ detail=f"Event is already {event.status}.",
+ )
+ event.status = "rejected"
+ return await update_event(event)
+
+
+@events_api_router.get(
+ "/{event_id}/tickets",
+ response_model=list[PublicTicket],
+)
+async def api_event_tickets(event_id: str) -> list[Ticket]:
+ return await get_event_tickets(event_id)
+
+
@tickets_api_router.get("")
async def api_tickets(
all_wallets: bool = Query(False),
@@ -211,10 +336,13 @@ async def api_ticket_create(
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist."
)
-
+ if event.status != "approved":
+ raise HTTPException(
+ status_code=HTTPStatus.GONE,
+ detail="Event is not yet open for tickets.",
+ )
if event.canceled:
raise HTTPException(status_code=HTTPStatus.GONE, detail="Event is canceled.")
-
if event.amount_tickets > 0 and event.sold >= event.amount_tickets:
raise HTTPException(status_code=HTTPStatus.GONE, detail="Event is sold out.")