chore: rebase onto upstream v1.6.1 + bump to v1.6.1-aio.1

Rebases the aio fork onto upstream v1.6.1 (4bf867e), pulling in:
- fiat checkout + email/Nostr DM ticket notifications (PR #50)
- currency-conversion fix (v1.5.0)
- custom notification subject/body (v1.6.0)
- resend-email button on the ticket list (PR #51)

Notable merges:
- views_api.api_event_update keeps the explicit-field-list gating from
  the aio.4 security fix, with allow_fiat + fiat_currency added so an
  owner editing a fiat-enabled event keeps the fiat config.
- models.PublicEvent now exposes both upstream's fiat fields and our
  location / categories / status fields.
- migrations.py reverts to byte-identical to upstream v1.6.1 (no aio
  entries); fork schema lives in migrations_fork.py (per aiolabs/lnbits#8).
- Lint reformatted with black + ruff to match upstream style.

Contributors entry adds `padreug` (aio fork maintainer).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

config.json

@@ -1,6 +1,6 @@
 {
   "id": "events",
-  "version": "1.3.0-aio.6",
+  "version": "1.6.1-aio.1",
   "name": "Events",
   "repo": "https://git.atitlan.io/aiolabs/events",
   "short_description": "Sell and register event tickets",
@@ -36,7 +36,7 @@
     {
       "name": "padreug",
       "uri": "https://git.atitlan.io/padreug",
-      "role": "Developer (aio fork: approval workflow + NIP-52 Nostr sync)"
+      "role": "Developer (aio fork: approval workflow + NIP-52 Nostr sync + edit gating)"
     }
   ],
   "images": [

crud.py

@@ -94,7 +94,7 @@ async def update_ticket(ticket: Ticket) -> Ticket:
 
 
 async def get_ticket(payment_hash: str) -> Ticket | None:
-    row: dict | None = await db.fetchone(
+    row = await db.fetchone(
         "SELECT * FROM events.ticket WHERE id = :id",
         {"id": payment_hash},
     )
@@ -107,15 +107,13 @@ async def get_tickets(wallet_ids: str | list[str]) -> list[Ticket]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
     q = ",".join([f"'{wallet_id}'" for wallet_id in wallet_ids])
-    rows: list[dict] = await db.fetchall(
+    rows = await db.fetchall(f"SELECT * FROM events.ticket WHERE wallet IN ({q})")
-        f"SELECT * FROM events.ticket WHERE wallet IN ({q})"
-    )
     return [Ticket(**_parse_ticket_row(row)) for row in rows]
 
 
 async def get_tickets_by_user_id(user_id: str) -> list[Ticket]:
     """All tickets owned by the given LNbits user_id."""
-    rows: list[dict] = await db.fetchall(
+    rows = await db.fetchall(
         "SELECT * FROM events.ticket WHERE user_id = :user_id ORDER BY time DESC",
         {"user_id": user_id},
     )
@@ -208,7 +206,7 @@ async def get_pending_events() -> list[Event]:
 
 async def get_settings() -> EventsSettings:
     """Singleton settings row, seeded by m010."""
-    row: dict | None = await db.fetchone("SELECT * FROM events.settings WHERE id = 1")
+    row = await db.fetchone("SELECT * FROM events.settings WHERE id = 1")
     if row:
         return EventsSettings(**dict(row))
     return EventsSettings()
@@ -227,7 +225,7 @@ async def delete_event(event_id: str) -> None:
 
 
 async def get_event_tickets(event_id: str) -> list[Ticket]:
-    rows: list[dict] = await db.fetchall(
+    rows = await db.fetchall(
         "SELECT * FROM events.ticket WHERE event = :event",
         {"event": event_id},
     )

migrations.py

@@ -175,3 +175,23 @@ async def m006_add_extra_fields(db):
 
     # Add 'extra' column to ticket table
     await db.execute("ALTER TABLE events.ticket ADD COLUMN extra TEXT;")
+
+
+async def m007_add_allow_fiat(db):
+    """
+    Add an allow_fiat column so event owners can explicitly enable fiat checkout.
+    """
+    await db.execute("""
+        ALTER TABLE events.events
+        ADD COLUMN allow_fiat BOOLEAN NOT NULL DEFAULT FALSE;
+        """)
+
+
+async def m008_add_fiat_currency(db):
+    """
+    Add a fiat_currency column for sat-denominated events using fiat checkout.
+    """
+    await db.execute("""
+        ALTER TABLE events.events
+        ADD COLUMN fiat_currency TEXT NOT NULL DEFAULT 'GBP';
+        """)

models.py

@@ -24,6 +24,10 @@ class EventExtra(BaseModel):
     promo_codes: list[PromoCode] = Field(default_factory=list)
     conditional: bool = False
     min_tickets: int = 1
+    email_notifications: bool = False
+    nostr_notifications: bool = False
+    notification_subject: str = ""
+    notification_body: str = ""
 
 
 class CreateEvent(BaseModel):
@@ -36,6 +40,8 @@ class CreateEvent(BaseModel):
     event_start_date: str
     event_end_date: str | None = None  # same format as event_start_date
     currency: str = "sat"
+    allow_fiat: bool = False
+    fiat_currency: str = "GBP"
     amount_tickets: int = 0  # 0 = unlimited / not ticketed
     price_per_ticket: float = 0  # 0 = free
     banner: str | None = None
@@ -55,6 +61,8 @@ class Event(BaseModel):
     event_start_date: str
     event_end_date: str | None = None
     currency: str = "sat"
+    allow_fiat: bool = False
+    fiat_currency: str = "GBP"
     amount_tickets: int = 0
     price_per_ticket: float = 0
     time: datetime
@@ -82,9 +90,14 @@ class PublicEvent(BaseModel):
     canceled: bool
     event_start_date: str
     event_end_date: str | None = None
+    currency: str
+    allow_fiat: bool = False
+    fiat_currency: str = "GBP"
+    price_per_ticket: float
     banner: str | None
     location: str | None = None
     categories: list[str] = Field(default_factory=list)
+    extra: EventExtra = Field(default_factory=EventExtra)
     status: str = "approved"  # surfaces "proposed"/"rejected" so SFC can render banner
 
     @validator("categories", pre=True)
@@ -104,6 +117,10 @@ class TicketExtra(BaseModel):
     applied_promo_code: str | None = None
     sats_paid: int | None = None
     refund_address: str | None = None
+    nostr_identifier: str | None = None
+    ticket_base_url: str | None = None
+    email_notification_sent: bool = False
+    nostr_notification_sent: bool = False
     refunded: bool = False
 
 
@@ -113,6 +130,9 @@ class CreateTicket(BaseModel):
     user_id: str | None = None  # LNbits user id (alternative to name+email)
     promo_code: str | None = None
     refund_address: str | None = None
+    nostr_identifier: str | None = None
+    payment_method: str | None = None
+    fiat_provider: str | None = None
 
     @root_validator
     def validate_identifiers(cls, values):
@@ -151,4 +171,7 @@ class PublicTicket(BaseModel):
 
 class TicketPaymentRequest(BaseModel):
     payment_hash: str
-    payment_request: str
+    payment_request: str | None = None
+    fiat_payment_request: str | None = None
+    fiat_provider: str | None = None
+    is_fiat: bool = False

nostr_hooks.py

@@ -29,15 +29,11 @@ async def publish_or_delete_nostr_event(event: Event, *, delete: bool = False) -
         if not wallet_obj:
             return
         account = await get_account(wallet_obj.user)
-        if not account or not account.pubkey or not account.prvkey:  # type: ignore[attr-defined]
+        if not account or not account.pubkey or not account.prvkey:
             return
 
         nostr_event = await publish_event_to_nostr(
-            nostr_client,
+            nostr_client, event, account.pubkey, account.prvkey, delete=delete
-            event,
-            account.pubkey,
-            account.prvkey,  # type: ignore[attr-defined]
-            delete=delete,
         )
         if nostr_event and not delete:
             event.nostr_event_id = nostr_event.id

nostr_sync.py

@@ -50,7 +50,7 @@ async def _handle_calendar_event(nostr_client: NostrClient, event_data: dict):
         return
 
     tags = {t[0]: t[1] for t in event_data.get("tags", []) if len(t) >= 2}
-    tag_lists: dict[str, list[str]] = {}
+    tag_lists = {}
     for t in event_data.get("tags", []):
         if len(t) >= 2:
             tag_lists.setdefault(t[0], []).append(t[1])

services.py

@@ -1,3 +1,15 @@
+from __future__ import annotations
+
+from asyncio.tasks import create_task
+
+from lnbits.core.models.users import UserNotifications
+from lnbits.core.services.nostr import send_nostr_dm
+from lnbits.core.services.notifications import (
+    send_email_notification,
+    send_user_notification,
+)
+from lnbits.settings import settings
+from lnbits.utils.nostr import normalize_private_key, normalize_public_key
 from lnurl import execute
 from loguru import logger
 
@@ -8,7 +20,13 @@ from .crud import (
     update_event,
     update_ticket,
 )
-from .models import Ticket
+from .models import Event, Ticket
+
+DEFAULT_NOSTR_RELAYS = [
+    "wss://relay.damus.io",
+    "wss://relay.primal.net",
+    "wss://relay.nostr.band",
+]
 
 
 async def set_ticket_paid(ticket: Ticket) -> Ticket:
@@ -27,6 +45,97 @@ async def set_ticket_paid(ticket: Ticket) -> Ticket:
     return ticket
 
 
+def send_ticket_notification_in_background(ticket: Ticket) -> None:
+    create_task(_send_ticket_notification(ticket))
+
+
+async def _send_ticket_notification(ticket: Ticket) -> None:
+    event = await get_event(ticket.event)
+    if not event:
+        logger.warning(f"Event {ticket.event} not found for ticket notification.")
+        return
+
+    subject, message = _ticket_notification_message(ticket, event)
+    updated = False
+
+    if (
+        event.extra.email_notifications
+        and settings.lnbits_email_notifications_enabled
+        and ticket.email
+    ):
+        try:
+            await send_email_notification([ticket.email], message, subject)
+            ticket.extra.email_notification_sent = True
+            updated = True
+        except Exception as exc:
+            logger.warning(f"Failed to email ticket {ticket.id}: {exc}")
+
+    if (
+        event.extra.nostr_notifications
+        and settings.is_nostr_notifications_configured()
+        and ticket.extra.nostr_identifier
+    ):
+        try:
+            await _send_nostr_ticket_notification(
+                ticket.extra.nostr_identifier, message
+            )
+            ticket.extra.nostr_notification_sent = True
+            updated = True
+        except Exception as exc:
+            logger.warning(f"Failed to send nostr DM for ticket {ticket.id}: {exc}")
+
+    if updated:
+        await update_ticket(ticket)
+
+
+async def resend_ticket_email_notification(ticket: Ticket) -> Ticket:
+    event = await get_event(ticket.event)
+    if not event:
+        raise ValueError("Event does not exist.")
+    if not settings.lnbits_email_notifications_enabled:
+        raise ValueError("Email notifications are not enabled.")
+    if not ticket.email:
+        raise ValueError("Ticket does not have an email address.")
+
+    subject, message = _ticket_notification_message(ticket, event)
+    await send_email_notification([ticket.email], message, subject)
+    ticket.extra.email_notification_sent = True
+    return await update_ticket(ticket)
+
+
+def _ticket_notification_message(ticket: Ticket, event: Event) -> tuple[str, str]:
+    ticket_url = _ticket_url(ticket)
+    subject = (
+        event.extra.notification_subject.strip()
+        or f"Your ticket for '{event.name}' is ready"
+    )
+    body = (
+        event.extra.notification_body.strip()
+        or f"Your ticket for '{event.name}' is ready."
+    )
+
+    return subject, f"{body}\n\nOpen it here: {ticket_url}"
+
+
+async def _send_nostr_ticket_notification(identifier: str, message: str) -> None:
+    if "@" in identifier:
+        await send_user_notification(
+            UserNotifications(nostr_identifier=identifier),
+            message,
+            "text_message",
+        )
+        return
+
+    private_key = normalize_private_key(settings.lnbits_nostr_notifications_private_key)
+    public_key = normalize_public_key(identifier)
+    await send_nostr_dm(private_key, public_key, message, DEFAULT_NOSTR_RELAYS)
+
+
+def _ticket_url(ticket: Ticket) -> str:
+    base_url = (ticket.extra.ticket_base_url or settings.lnbits_baseurl).rstrip("/")
+    return f"{base_url}/events/ticket/{ticket.id}"
+
+
 async def refund_tickets(event_id: str):
     """
     Refund tickets for an event that has not met the minimum ticket requirement.

static/js/display.js

@@ -11,7 +11,9 @@ window.PageEventsDisplay = {
         data: {
           name: '',
           email: '',
-          refund: ''
+          refund: '',
+          nostr_identifier: '',
+          payment_method: 'lightning'
         }
       },
       ticketLink: {
@@ -23,7 +25,8 @@ window.PageEventsDisplay = {
       receive: {
         show: false,
         status: 'pending',
-        paymentReq: null
+        paymentReq: null,
+        isFiat: false
       },
       paymentDismissMsg: null,
       paymentWebsocket: null
@@ -35,7 +38,25 @@ window.PageEventsDisplay = {
   },
   computed: {
     formatDescription() {
-      return LNbits.utils.convertMarkdown(this.info)
+      return LNbits.utils.convertMarkdown(this.event?.info || '')
+    },
+    allowFiatCheckout() {
+      return Boolean(this.event?.allow_fiat)
+    },
+    fiatCheckoutLabel() {
+      if (!this.allowFiatCheckout) return 'Fiat'
+      const unit = ['sat', 'sats'].includes(
+        (this.event?.currency || '').toLowerCase()
+      )
+        ? this.event?.fiat_currency
+        : this.event?.currency
+      return `Fiat (${(unit || 'GBP').toUpperCase()})`
+    },
+    allowEmailNotifications() {
+      return Boolean(this.event?.extra?.email_notifications)
+    },
+    allowNostrNotifications() {
+      return Boolean(this.event?.extra?.nostr_notifications)
     }
   },
   methods: {
@@ -56,6 +77,8 @@ window.PageEventsDisplay = {
       this.formDialog.data.name = ''
       this.formDialog.data.email = ''
       this.formDialog.data.refund = ''
+      this.formDialog.data.nostr_identifier = ''
+      this.formDialog.data.payment_method = 'lightning'
     },
 
     closeReceiveDialog() {
@@ -87,6 +110,9 @@ window.PageEventsDisplay = {
       this.paymentReq = null
       this.formDialog.data.name = ''
       this.formDialog.data.email = ''
+      this.formDialog.data.refund = ''
+      this.formDialog.data.nostr_identifier = ''
+      this.formDialog.data.payment_method = 'lightning'
       Quasar.Notify.create({
         type: 'positive',
         message: 'Sent, thank you!',
@@ -95,7 +121,8 @@ window.PageEventsDisplay = {
       this.receive = {
         show: false,
         status: 'complete',
-        paymentReq: null
+        paymentReq: null,
+        isFiat: false
       }
       this.ticketLink = {
         show: true,
@@ -103,9 +130,7 @@ window.PageEventsDisplay = {
           link: `/events/ticket/${paymentHash}`
         }
       }
-      setTimeout(() => {
+      window.open(`/events/ticket/${paymentHash}`, '_blank', 'noopener')
-        window.location.href = `/events/ticket/${paymentHash}`
-      }, 5000)
     },
     async createInvoice() {
       try {
@@ -117,10 +142,15 @@ window.PageEventsDisplay = {
             name: this.formDialog.data.name,
             email: this.formDialog.data.email,
             promo_code: this.formDialog.data.promo_code || null,
-            refund_address: this.formDialog.data.refund || null
+            refund_address: this.formDialog.data.refund || null,
+            nostr_identifier: this.formDialog.data.nostr_identifier || null,
+            payment_method: this.formDialog.data.payment_method
           }
         )
-        this.paymentReq = data.payment_request
+        const isFiat = Boolean(data.is_fiat)
+        this.paymentReq = isFiat
+          ? data.fiat_payment_request || null
+          : data.payment_request
         this.paymentHash = data.payment_hash
 
         this.paymentDismissMsg = Quasar.Notify.create({
@@ -130,30 +160,34 @@ window.PageEventsDisplay = {
         this.receive = {
           show: true,
           status: 'pending',
-          paymentReq: this.paymentReq
+          paymentReq: this.paymentReq,
+          isFiat
         }
-        this.websocketListener(this.paymentHash)
+        if (isFiat && this.paymentReq) {
+          window.open(this.paymentReq, '_blank', 'noopener')
+        }
+        this.paymentWatcher(this.paymentHash)
       } catch (error) {
         LNbits.utils.notifyApiError(error)
       }
     },
-    websocketListener(paymentHash) {
+    paymentWatcher(paymentHash) {
       if (this.paymentWebsocket) {
         this.paymentWebsocket.close()
       }
 
       const url = new URL(window.location)
-      url.protocol = url.protocol === 'https:' ? 'wss' : 'ws'
+      url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:'
-      url.pathname = `/events/api/v1/tickets/ws/${paymentHash}`
+      url.pathname = `/api/v1/ws/${paymentHash}`
       url.search = ''
       url.hash = ''
 
-      const ws = new WebSocket(url)
+      const ws = new WebSocket(url.toString())
       this.paymentWebsocket = ws
 
       ws.onmessage = event => {
         const data = JSON.parse(event.data)
-        if (data.paid) {
+        if (data.pending === false) {
           this.paymentSuccess(paymentHash)
           ws.close()
         }

static/js/display.vue

@@ -41,41 +41,77 @@
         <q-card-section class="q-pa-none">
           <h5 class="q-mt-none">Buy Ticket</h5>
           <q-form @submit="createInvoice()" class="q-gutter-md">
+            <div class="row">
+              <div class="col-12">
+                <q-input
+                  filled
+                  dense
+                  v-model.trim="formDialog.data.name"
+                  label="Your name "
+                  :rules="[val => nameValidation(val)]"
+                ></q-input>
+              </div>
+              <div class="col-12 col-md-6 q-pr-sm">
+                <q-input
+                  filled
+                  dense
+                  v-model.trim="formDialog.data.email"
+                  type="email"
+                  :label="
+                    allowEmailNotifications
+                      ? 'Your email (ticket delivery) '
+                      : 'Your email '
+                  "
+                  :rules="[
+                    val => !!val || '* Required',
+                    val => emailValidation(val)
+                  ]"
+                  lazy-rules
+                ></q-input>
+              </div>
+              <div v-if="allowNostrNotifications" class="col-12 col-md-6">
+                <q-input
+                  filled
+                  dense
+                  v-model.trim="formDialog.data.nostr_identifier"
+                  label="(optional) Nostr NIP-05 or npub"
+                  hint="If provided, we'll DM your ticket link after payment."
+                ></q-input>
+              </div>
+            </div>
             <q-input
-              filled
+              v-if="event.extra?.conditional"
-              dense
-              v-model.trim="formDialog.data.name"
-              label="Your name "
-              :rules="[val => nameValidation(val)]"
-            ></q-input>
-            <q-input
-              filled
-              dense
-              v-model.trim="formDialog.data.email"
-              type="email"
-              label="Your email "
-              :rules="[
-                val => !!val || '* Required',
-                val => emailValidation(val)
-              ]"
-              lazy-rules
-            ></q-input>
-            <q-input
-              v-if="this.extra?.conditional"
               filled
               dense
               v-model.trim="formDialog.data.refund"
               label="Refund lnadress or LNURL "
               :rules="[val => !!val || '* Required']"
               lazy-rules
-              :hint="`If minimum tickets (${this.extra?.min_tickets}) are not met, refund will be sent.`"
+              :hint="`If minimum tickets (${event.extra?.min_tickets}) are not met, refund will be sent.`"
-            ></q-input>
-            <q-input
-              filled
-              dense
-              v-model.trim="formDialog.data.promo_code"
-              label="(optional) Promo Code "
             ></q-input>
+            <div class="row q-col-gutter-md q-pt-lg items-center">
+              <div v-if="allowFiatCheckout" class="col-auto">
+                <q-option-group
+                  v-model="formDialog.data.payment_method"
+                  inline
+                  :options="[
+                    {label: 'Lightning', value: 'lightning'},
+                    {
+                      label: fiatCheckoutLabel,
+                      value: 'fiat'
+                    }
+                  ]"
+                ></q-option-group>
+              </div>
+              <div :class="allowFiatCheckout ? 'col-12 col-md-3' : 'col-12'">
+                <q-input
+                  filled
+                  dense
+                  v-model.trim="formDialog.data.promo_code"
+                  label="(optional) Promo Code "
+                ></q-input>
+              </div>
+            </div>
             <div class="row q-mt-lg">
               <q-btn
                 unelevated
@@ -107,8 +143,6 @@
             type="a"
             >Link to your ticket!</q-btn
           >
-          <br /><br />
-          <p>You'll be redirected in a few moments...</p>
         </div>
       </q-card>
     </div>
@@ -119,6 +153,37 @@
         class="q-pa-lg q-pt-xl lnbits__dialog-card"
       >
       </q-card>
+      <q-card
+        v-else-if="receive.isFiat"
+        class="q-pa-lg q-pt-xl lnbits__dialog-card"
+      >
+        <div class="text-center q-mb-lg">
+          <div class="text-h6 q-mb-sm">Continue to checkout</div>
+          <div class="text-body2 text-grey-5 q-mb-lg">
+            Your fiat checkout opened in a new tab. If it did not, use the
+            button below.
+          </div>
+          <q-btn
+            unelevated
+            color="primary"
+            type="a"
+            :href="receive.paymentReq"
+            target="_blank"
+            rel="noopener"
+          >
+            Go to checkout
+          </q-btn>
+        </div>
+        <div class="row q-mt-lg">
+          <q-btn
+            outline
+            color="grey"
+            @click="utils.copyText(receive.paymentReq)"
+            >Copy payment link</q-btn
+          >
+          <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
+        </div>
+      </q-card>
       <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
         <div class="text-center q-mb-lg">
           <lnbits-qrcode

static/js/index.js

@@ -4,6 +4,7 @@ window.PageEvents = {
     return {
       events: [],
       tickets: [],
+      resendingTicketEmails: [],
       currencies: [],
       pendingEvents: [],
       allUserEvents: [],
@@ -49,7 +50,7 @@ window.PageEvents = {
             align: 'left',
             label: 'Price',
             field: row => {
-              if (row.currency != 'sats') {
+              if (this.isFiatCurrency(row.currency)) {
                 return LNbits.utils.formatCurrency(
                   row.price_per_ticket.toFixed(2),
                   row.currency
@@ -105,14 +106,21 @@ window.PageEvents = {
         show: false,
         data: {
           currency: 'sats',
+          allow_fiat: false,
+          fiat_currency: 'GBP',
           extra: {
-            promo_codes: []
+            promo_codes: [],
+            notification_subject: '',
+            notification_body: ''
           }
         }
       }
     }
   },
   methods: {
+    isFiatCurrency(currency) {
+      return !['sat', 'sats'].includes((currency || '').toLowerCase())
+    },
     getTickets() {
       LNbits.api
         .request(
@@ -145,6 +153,35 @@ window.PageEvents = {
             .catch(LNbits.utils.notifyApiError)
         })
     },
+    resendTicketEmail(ticket) {
+      if (!ticket.paid || !ticket.email) return
+      const wallet = _.findWhere(this.g.user.wallets, {id: ticket.wallet})
+      if (!wallet) return
+
+      this.resendingTicketEmails.push(ticket.id)
+      LNbits.api
+        .request(
+          'POST',
+          '/events/api/v1/tickets/' + ticket.id + '/resend-email',
+          wallet.adminkey
+        )
+        .then(response => {
+          this.tickets = this.tickets.map(obj =>
+            obj.id === ticket.id ? response.data : obj
+          )
+          Quasar.Notify.create({
+            type: 'positive',
+            message: 'Ticket email resent.',
+            icon: null
+          })
+        })
+        .catch(LNbits.utils.notifyApiError)
+        .finally(() => {
+          this.resendingTicketEmails = this.resendingTicketEmails.filter(
+            ticketId => ticketId !== ticket.id
+          )
+        })
+    },
     exportticketsCSV() {
       LNbits.utils.exportCSV(this.ticketsTable.columns, this.tickets)
     },
@@ -187,7 +224,12 @@ window.PageEvents = {
     },
     saveSettings() {
       LNbits.api
-        .request('PUT', '/events/api/v1/events/settings', null, this.settings)
+        .request(
+          'PUT',
+          '/events/api/v1/events/settings',
+          null,
+          this.settings
+        )
         .then(() => {
           Quasar.Notify.create({type: 'positive', message: 'Settings saved'})
         })
@@ -266,10 +308,18 @@ window.PageEvents = {
       delete data.event_end_day
       delete data.event_end_time
 
-      if (data.extra && !data.extra.promo_codes) {
+      if (data.extra?.promo_codes) {
         data.extra.promo_codes = data.extra.promo_codes
-          .filter(code => code.trim() !== '')
+          .filter(code => code.code?.trim() !== '')
-          .map(code => code.trim().toUpperCase())
+          .map(code => ({
+            ...code,
+            code: code.code.trim().toUpperCase()
+          }))
+      }
+      if (!this.isFiatCurrency(data.currency)) {
+        if (!data.allow_fiat) {
+          data.fiat_currency = 'GBP'
+        }
       }
 
       if (data.id) {
@@ -293,6 +343,8 @@ window.PageEvents = {
       } else {
         this.formDialog.data = {
           currency: 'sats',
+          allow_fiat: false,
+          fiat_currency: 'GBP',
           event_start_day: '',
           event_start_time: '',
           event_end_day: '',
@@ -300,7 +352,11 @@ window.PageEvents = {
           extra: {
             conditional: false,
             min_tickets: 1,
-            promo_codes: []
+            email_notifications: false,
+            nostr_notifications: false,
+            promo_codes: [],
+            notification_subject: '',
+            notification_body: ''
           }
         }
       }
@@ -309,8 +365,15 @@ window.PageEvents = {
     resetEventDialog() {
       this.formDialog.show = false
       this.formDialog.data = {
+        currency: 'sats',
+        allow_fiat: false,
+        fiat_currency: 'GBP',
         extra: {
-          promo_codes: []
+          email_notifications: false,
+          nostr_notifications: false,
+          promo_codes: [],
+          notification_subject: '',
+          notification_body: ''
         }
       }
     },

static/js/index.vue

@@ -192,13 +192,7 @@
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <q-badge
                     v-if="col.name === 'status'"
-                    :color="
+                    :color="col.value === 'approved' ? 'green' : col.value === 'proposed' ? 'orange' : 'red'"
-                      col.value === 'approved'
-                        ? 'green'
-                        : col.value === 'proposed'
-                          ? 'orange'
-                          : 'red'
-                    "
                     :label="col.value"
                   ></q-badge>
                   <span v-else v-text="col.value"></span>
@@ -290,13 +284,7 @@
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <q-badge
                     v-if="col.name === 'status'"
-                    :color="
+                    :color="col.value === 'approved' ? 'green' : col.value === 'proposed' ? 'orange' : 'red'"
-                      col.value === 'approved'
-                        ? 'green'
-                        : col.value === 'proposed'
-                          ? 'orange'
-                          : 'red'
-                    "
                     :label="col.value"
                   ></q-badge>
                   <span v-else v-text="col.value"></span>
@@ -329,10 +317,12 @@
           >
             <template v-slot:header="props">
               <q-tr :props="props">
+                <q-th auto-width></q-th>
                 <q-th auto-width></q-th>
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span v-text="col.label"></span>
                 </q-th>
+                <q-th auto-width></q-th>
               </q-tr>
             </template>
             <template v-slot:body="props">
@@ -349,6 +339,20 @@
                     target="_blank"
                   ></q-btn>
                 </q-td>
+                <q-td auto-width>
+                  <q-btn
+                    flat
+                    dense
+                    size="xs"
+                    @click="resendTicketEmail(props.row)"
+                    icon="email"
+                    color="primary"
+                    :disable="!props.row.paid || !props.row.email"
+                    :loading="resendingTicketEmails.includes(props.row.id)"
+                  >
+                    <q-tooltip>Resend ticket email</q-tooltip>
+                  </q-btn>
+                </q-td>
 
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <span v-text="col.value"></span>
@@ -547,6 +551,29 @@
               ></q-input>
             </div>
           </div>
+          <q-toggle
+            v-model="formDialog.data.allow_fiat"
+            label="Allow fiat checkout"
+            left-label
+            hint="Lets attendees pay through a configured fiat provider using the event currency."
+          ></q-toggle>
+          <q-select
+            v-if="
+              formDialog.data.allow_fiat &&
+              ['sat', 'sats'].includes(
+                (formDialog.data.currency || '').toLowerCase()
+              )
+            "
+            filled
+            dense
+            v-model="formDialog.data.fiat_currency"
+            label="Fiat checkout currency"
+            :options="
+              currencies.filter(
+                c => !['sat', 'sats'].includes((c || '').toLowerCase())
+              )
+            "
+          ></q-select>
           <q-expansion-item
             group="advanced"
             icon="settings"
@@ -649,8 +676,41 @@
                 >Add Promo Code</q-btn
               >
             </div>
+            <q-separator class="q-my-md"></q-separator>
+            <div class="text-subtitle1 q-mb-md">Ticket Delivery</div>
+            <div class="text-caption">
+              Send the paid ticket link automatically by email or Nostr DM.
+            </div>
+            <q-toggle
+              v-model="formDialog.data.extra.email_notifications"
+              label="Email notifications"
+              left-label
+            ></q-toggle>
+            <q-toggle
+              v-model="formDialog.data.extra.nostr_notifications"
+              label="Nostr notifications"
+              left-label
+            ></q-toggle>
           </q-expansion-item>
 
+          <q-separator class="q-my-md"></q-separator>
+          <q-input
+            filled
+            dense
+            v-model.trim="formDialog.data.extra.notification_subject"
+            type="text"
+            label="Ticket notification subject"
+            hint="Used as the email subject when sending paid ticket links."
+          ></q-input>
+          <q-input
+            filled
+            dense
+            v-model.trim="formDialog.data.extra.notification_body"
+            type="textarea"
+            label="Ticket notification body"
+            hint="Shown before the ticket link in the paid ticket notification."
+          ></q-input>
+
           <div class="row q-mt-lg">
             <q-btn
               v-if="formDialog.data.id"

static/js/ticket.js

@@ -3,7 +3,7 @@ window.PageEventsTicket = {
   data() {
     return {
       ticketId: null,
-      ticketName: null
+      ticket: null
     }
   },
   methods: {
@@ -18,7 +18,7 @@ window.PageEventsTicket = {
         'GET',
         `/events/api/v1/tickets/${this.ticketId}`
       )
-      this.ticketName = data.ticket_name
+      this.ticket = data
     } catch (error) {
       LNbits.utils.notifyApiError(error)
     }

static/js/ticket.vue

@@ -5,20 +5,32 @@
         <q-card-section class="q-pa-none">
           <center>
             <h3 class="q-my-none">Ticket</h3>
+            <h5 v-if="ticket" v-text="ticket.name" class="q-my-none"></h5>
             <br />
             <h5 class="q-my-none">
               Bookmark, print or screenshot this page,<br />
               and present it for registration!
             </h5>
-            <br />
+            <div v-if="ticket" class="row justify-center q-gutter-sm q-mb-md">
+              <q-btn
+                unelevated
+                :color="ticket.paid ? 'positive' : 'negative'"
+                :label="ticket.paid ? 'Paid' : 'Not Paid'"
+              ></q-btn>
+              <q-btn
+                unelevated
+                :color="ticket.registered ? 'positive' : 'warning'"
+                :label="ticket.registered ? 'Checked In' : 'Not Checked In'"
+              ></q-btn>
+            </div>
             <lnbits-qrcode
               :value="`ticket://${ticketId}`"
               :options="{width: 500}"
             ></lnbits-qrcode>
             <br />
-            <q-btn @click="printWindow" color="grey" class="q-ml-auto">
+            <q-btn @click="printWindow" color="grey">
-              <q-icon left size="3em" name="print"></q-icon> Print</q-btn
+              <q-icon left size="3em" name="print"></q-icon> Print
-            >
+            </q-btn>
           </center>
         </q-card-section>
       </q-card>

tasks.py

@@ -6,7 +6,7 @@ from loguru import logger
 
 from .crud import get_ticket
 from .models import Ticket
-from .services import set_ticket_paid
+from .services import send_ticket_notification_in_background, set_ticket_paid
 
 payment_listeners: dict[str, list[asyncio.Queue[Ticket]]] = {}
 
@@ -43,6 +43,7 @@ async def on_invoice_paid(payment: Payment) -> None:
         return
 
     ticket = await set_ticket_paid(ticket)
+    send_ticket_notification_in_background(ticket)
     if payment_listeners.get(payment.payment_hash):
         for paid_ticket_queue in payment_listeners[payment.payment_hash]:
             paid_ticket_queue.put_nowait(ticket)

views_api.py

@@ -8,21 +8,27 @@ from fastapi import (
     Depends,
     HTTPException,
     Query,
+    Request,
     WebSocket,
     WebSocketDisconnect,
 )
 from lnbits.core.crud import get_user
+from lnbits.core.crud.wallets import get_wallet
 from lnbits.core.models import Account, WalletTypeInfo
-from lnbits.core.services import create_invoice
+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,
 )
+from lnbits.settings import settings
 from lnbits.utils.exchange_rates import (
     fiat_amount_as_satoshis,
     get_fiat_rate_satoshis,
+    satoshis_amount_as_fiat,
 )
+from lnbits.utils.nostr import normalize_public_key
 
 from .crud import (
     create_event,
@@ -39,7 +45,6 @@ from .crud import (
     get_settings,
     get_ticket,
     get_tickets,
-    get_tickets_by_user_id,
     purge_unpaid_tickets,
     update_event,
     update_settings,
@@ -56,13 +61,17 @@ from .models import (
     TicketPaymentRequest,
 )
 from .nostr_hooks import publish_or_delete_nostr_event
-from .services import refund_tickets
+from .services import refund_tickets, resend_ticket_email_notification
 from .tasks import deregister_payment_listener, register_payment_listener
 
 events_api_router = APIRouter(prefix="/api/v1/events")
 tickets_api_router = APIRouter(prefix="/api/v1/tickets")
 
 
+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.
 
@@ -153,8 +162,9 @@ async def api_get_event(event_id: str) -> Event:
     # 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
-    # Accept either YYYY-MM-DD or full ISO 8601 datetime (e.g. event_end_date
+    # Accept either YYYY-MM-DD or full ISO 8601 datetime (event_end_date
-    # may carry a time component since v1.3.0-aio.3).
+    # may carry a time component since v1.3.0-aio.3 / our start-end-time
+    # feature).
     try:
         closing_dt = datetime.fromisoformat(closing_date)
     except ValueError:
@@ -253,6 +263,8 @@ async def api_event_update(
         data.closing_date = data.event_end_date
 
     # Explicit field list — never copy `status` from the request body.
+    # Includes upstream v1.6.1 fields (allow_fiat, fiat_currency) so an
+    # owner editing a fiat-enabled event keeps the fiat config.
     for field in (
         "name",
         "info",
@@ -260,6 +272,8 @@ async def api_event_update(
         "event_start_date",
         "event_end_date",
         "currency",
+        "allow_fiat",
+        "fiat_currency",
         "amount_tickets",
         "price_per_ticket",
         "banner",
@@ -385,16 +399,6 @@ async def api_tickets(
     return await get_tickets(wallet_ids)
 
 
-@tickets_api_router.get("/user/{user_id}")
-async def api_tickets_by_user_id(user_id: str) -> list[Ticket]:
-    """Tickets bound to an LNbits user_id (used by external integrations).
-
-    Declared before /{ticket_id} so FastAPI matches the literal `/user/`
-    prefix instead of treating "user" as a ticket id.
-    """
-    return await get_tickets_by_user_id(user_id)
-
-
 @tickets_api_router.get("/{ticket_id}", response_model=PublicTicket)
 async def api_get_ticket(ticket_id: str) -> Ticket:
     ticket = await get_ticket(ticket_id)
@@ -411,7 +415,9 @@ async def api_get_ticket(ticket_id: str) -> Ticket:
 
 
 @tickets_api_router.post("/{event_id}")
-async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentRequest:
+async def api_ticket_create(
+    event_id: str, data: CreateTicket, request: Request
+) -> TicketPaymentRequest:
     event = await get_event(event_id)
     if not event:
         raise HTTPException(
@@ -427,42 +433,93 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR
     if event.amount_tickets > 0 and event.sold >= event.amount_tickets:
         raise HTTPException(status_code=HTTPStatus.GONE, detail="Event is sold out.")
 
-    if data.user_id:
-        return await _create_user_id_ticket(event, data.user_id)
-    return await _create_named_ticket(event, data)
-
-
-async def _create_named_ticket(
-    event: Event, data: CreateTicket
-) -> TicketPaymentRequest:
     name = data.name
     email = data.email
     promo_code = data.promo_code.upper() if data.promo_code else None
     refund_address = data.refund_address
+    nostr_identifier = data.nostr_identifier.strip() if data.nostr_identifier else None
+    payment_method = (data.payment_method or "lightning").lower()
+    if payment_method not in {"lightning", "fiat"}:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Unsupported payment method.",
+        )
+    if nostr_identifier and "@" not in nostr_identifier:
+        try:
+            nostr_identifier = normalize_public_key(nostr_identifier)
+        except Exception as exc:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="Invalid Nostr identifier.",
+            ) from exc
     price = event.price_per_ticket
     extra: dict[str, Any] = {"tag": "events", "name": name, "email": email}
 
     if promo_code:
+        # check if promo_code exists in event.extra.promo_codes
         if promo_code not in [pc.code for pc in event.extra.promo_codes]:
             raise HTTPException(
                 status_code=HTTPStatus.BAD_REQUEST, detail="Invalid promo code."
             )
+        # get the promocode
         promo = next(pc for pc in event.extra.promo_codes if pc.code == promo_code)
         extra["promo_code"] = promo.code
         price = event.price_per_ticket * (1 - promo.discount_percent / 100)
 
-    if event.currency != "sats":
+    if payment_method == "fiat" and not event.allow_fiat:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Fiat payments are not enabled for this event.",
+        )
+
+    if _is_fiat_currency(event.currency):
         extra["fiat"] = True
         extra["currency"] = event.currency
         extra["fiatAmount"] = price
         extra["rate"] = await get_fiat_rate_satoshis(event.currency)
-        price = await fiat_amount_as_satoshis(price, event.currency)
 
-    payment = await create_invoice(
+        if payment_method != "fiat":
+            price = await fiat_amount_as_satoshis(price, event.currency)
+
+    invoice_unit = event.currency
+    fiat_amount = price
+    fiat_provider = None
+    if payment_method == "fiat":
+        if _is_fiat_currency(event.currency):
+            invoice_unit = event.currency
+        else:
+            invoice_unit = event.fiat_currency
+            fiat_amount = await satoshis_amount_as_fiat(price, invoice_unit)
+            extra["fiat"] = True
+            extra["currency"] = invoice_unit
+            extra["fiatAmount"] = fiat_amount
+            extra["rate"] = await get_fiat_rate_satoshis(invoice_unit)
+        wallet = await get_wallet(event.wallet)
+        if not wallet:
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Event wallet does not exist.",
+            )
+        providers = settings.get_fiat_providers_for_user(wallet.user)
+        fiat_provider = data.fiat_provider or (providers[0] if providers else None)
+        if not fiat_provider:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="No fiat payment provider configured for this event.",
+            )
+    else:
+        invoice_unit = "sat"
+
+    payment = await create_payment_request(
         wallet_id=event.wallet,
-        amount=price,
+        invoice_data=CreateInvoice(
-        memo=f"{event.id}",
+            out=False,
-        extra=extra,
+            amount=fiat_amount if payment_method == "fiat" else price,
+            unit=invoice_unit,
+            fiat_provider=fiat_provider,
+            memo=f"{event_id}",
+            extra=extra,
+        ),
     )
     await create_ticket(
         payment_hash=payment.payment_hash,
@@ -473,39 +530,18 @@ async def _create_named_ticket(
         extra={
             "applied_promo_code": promo_code,
             "refund_address": refund_address,
-            "sats_paid": int(price),
+            "nostr_identifier": nostr_identifier,
+            "ticket_base_url": str(request.base_url).rstrip("/"),
+            "sats_paid": payment.sat,
         },
     )
+
     return TicketPaymentRequest(
-        payment_hash=payment.payment_hash, payment_request=payment.bolt11
-    )
-
-
-async def _create_user_id_ticket(event: Event, user_id: str) -> TicketPaymentRequest:
-    price = event.price_per_ticket
-    extra: dict[str, Any] = {"tag": "events", "user_id": user_id}
-
-    if event.currency != "sats":
-        price = await fiat_amount_as_satoshis(event.price_per_ticket, event.currency)
-        extra["fiat"] = True
-        extra["currency"] = event.currency
-        extra["fiatAmount"] = event.price_per_ticket
-        extra["rate"] = await get_fiat_rate_satoshis(event.currency)
-
-    payment = await create_invoice(
-        wallet_id=event.wallet,
-        amount=price,
-        memo=f"{event.id}",
-        extra=extra,
-    )
-    await create_ticket(
         payment_hash=payment.payment_hash,
-        wallet=event.wallet,
+        payment_request=getattr(payment, "bolt11", None),
-        event=event.id,
+        fiat_payment_request=getattr(payment, "extra", {}).get("fiat_payment_request"),
-        user_id=user_id,
+        fiat_provider=getattr(payment, "fiat_provider", None) or fiat_provider,
-    )
+        is_fiat=bool(getattr(payment, "fiat_provider", None) or fiat_provider),
-    return TicketPaymentRequest(
-        payment_hash=payment.payment_hash, payment_request=payment.bolt11
     )
 
 
@@ -567,6 +603,38 @@ async def api_ticket_delete(
     await delete_ticket(ticket_id)
 
 
+@tickets_api_router.post("/{ticket_id}/resend-email")
+async def api_ticket_resend_email(
+    ticket_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+) -> Ticket:
+    ticket = await get_ticket(ticket_id)
+    if not ticket:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Ticket does not exist."
+        )
+
+    if ticket.wallet != wallet.wallet.id:
+        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Not your ticket.")
+
+    if not ticket.paid:
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN,
+            detail="Only paid tickets can be resent by email.",
+        )
+
+    try:
+        return await resend_ticket_email_notification(ticket)
+    except ValueError as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail=str(exc)
+        ) from exc
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail="Failed to resend ticket email.",
+        ) from exc
+
+
 @tickets_api_router.put("/register/{ticket_id}")
 async def api_event_register_ticket(ticket_id) -> Ticket:
     ticket = await get_ticket(ticket_id)