fix: 1.0.0-rc5

did not work for internal payment

.github/workflows/lint.yml

@@ -0,0 +1,10 @@
+name: lint
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  lint:
+    uses: lnbits/lnbits/.github/workflows/lint.yml@dev

.github/workflows/release.yml

@@ -1,10 +1,9 @@
 on:
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-
   release:
     runs-on: ubuntu-latest
     steps:
@@ -34,12 +33,12 @@ jobs:
       - name: Create pull request in extensions repo
         env:
           GH_TOKEN: ${{ secrets.EXT_GITHUB }}
-          repo_name: "${{ github.event.repository.name }}"
-          tag: "${{ github.ref_name }}"
-          branch: "update-${{ github.event.repository.name }}-${{ github.ref_name }}"
-          title: "[UPDATE] ${{ github.event.repository.name }} to ${{ github.ref_name }}"
-          body: "https://github.com/lnbits/${{ github.event.repository.name }}/releases/${{ github.ref_name }}"
-          archive: "https://github.com/lnbits/${{ github.event.repository.name }}/archive/refs/tags/${{ github.ref_name }}.zip"
+          repo_name: '${{ github.event.repository.name }}'
+          tag: '${{ github.ref_name }}'
+          branch: 'update-${{ github.event.repository.name }}-${{ github.ref_name }}'
+          title: '[UPDATE] ${{ github.event.repository.name }} to ${{ github.ref_name }}'
+          body: 'https://github.com/lnbits/${{ github.event.repository.name }}/releases/${{ github.ref_name }}'
+          archive: 'https://github.com/lnbits/${{ github.event.repository.name }}/archive/refs/tags/${{ github.ref_name }}.zip'
         run: |
           cd lnbits-extensions
           git checkout -b $branch

.gitignore

@@ -1 +1,4 @@
 __pycache__
+node_modules
+.mypy_cache
+.venv

.prettierrc

@@ -0,0 +1,12 @@
+{
+  "semi": false,
+  "arrowParens": "avoid",
+  "insertPragma": false,
+  "printWidth": 80,
+  "proseWrap": "preserve",
+  "singleQuote": true,
+  "trailingComma": "none",
+  "useTabs": false,
+  "bracketSameLine": false,
+  "bracketSpacing": false
+}

Makefile

@@ -0,0 +1,47 @@
+all: format check
+
+format: prettier black ruff
+
+check: mypy pyright checkblack checkruff checkprettier
+
+prettier:
+	poetry run ./node_modules/.bin/prettier --write .
+pyright:
+	poetry run ./node_modules/.bin/pyright
+
+mypy:
+	poetry run mypy .
+
+black:
+	poetry run black .
+
+ruff:
+	poetry run ruff check . --fix
+
+checkruff:
+	poetry run ruff check .
+
+checkprettier:
+	poetry run ./node_modules/.bin/prettier --check .
+
+checkblack:
+	poetry run black --check .
+
+checkeditorconfig:
+	editorconfig-checker
+
+test:
+	PYTHONUNBUFFERED=1 \
+	DEBUG=true \
+	poetry run pytest
+install-pre-commit-hook:
+	@echo "Installing pre-commit hook to git"
+	@echo "Uninstall the hook with poetry run pre-commit uninstall"
+	poetry run pre-commit install
+
+pre-commit:
+	poetry run pre-commit run --all-files
+
+
+checkbundle:
+	@echo "skipping checkbundle"

__init__.py

@@ -1,16 +1,16 @@
 import asyncio
-from loguru import logger
 
 from fastapi import APIRouter
+from loguru import logger
 
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-from lnbits.tasks import create_permanent_unique_task
-
-db = Database("ext_events")
-
+from .crud import db
+from .tasks import wait_for_paid_invoices
+from .views import events_generic_router
+from .views_api import events_api_router
 
 events_ext: APIRouter = APIRouter(prefix="/events", tags=["Events"])
+events_ext.include_router(events_generic_router)
+events_ext.include_router(events_api_router)
 
 events_static_files = [
     {
@@ -19,18 +19,9 @@ events_static_files = [
     }
 ]
 
-
-def events_renderer():
-    return template_renderer(["events/templates"])
-
-
-from .tasks import wait_for_paid_invoices
-from .views import *  # noqa: F401,F403
-from .views_api import *  # noqa: F401,F403
-
-
 scheduled_tasks: list[asyncio.Task] = []
 
+
 def events_stop():
     for task in scheduled_tasks:
         try:
@@ -38,6 +29,12 @@ def events_stop():
         except Exception as ex:
             logger.warning(ex)
 
+
 def events_start():
+    from lnbits.tasks import create_permanent_unique_task
+
     task = create_permanent_unique_task("ext_events", wait_for_paid_invoices)
     scheduled_tasks.append(task)
+
+
+__all__ = ["db", "events_ext", "events_static_files", "events_start", "events_stop"]

config.json

@@ -2,6 +2,53 @@
   "name": "Events",
   "short_description": "Sell and register event tickets",
   "tile": "/events/static/image/events.png",
-  "contributors": ["benarc"],
-  "min_lnbits_version": "0.11.0"
+  "min_lnbits_version": "1.0.0",
+  "contributors": [
+    {
+      "name": "talvasconcelos",
+      "uri": "https://github.com/talvasconcelos",
+      "role": "Developer"
+    },
+    {
+      "name": "DNI",
+      "uri": "https://github.com/dni",
+      "role": "Developer"
+    },
+    {
+      "name": "prusnak",
+      "uri": "https://github.com/prusnak",
+      "role": "Developer"
+    },
+    {
+      "name": "Ben Arc",
+      "uri": "https://github.com/arcbtc",
+      "role": "Developer"
+    },
+    {
+      "name": "motorina0",
+      "uri": "https://github.com/motorina0",
+      "role": "Developer"
+    }
+  ],
+  "images": [
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/events/main/static/image/1.jpg",
+      "link": "https://www.youtube.com/embed/hGTkJ9e5TNk?si=DXqBEEzpyyb33UQd"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/events/main/static/image/1.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/events/main/static/image/2.jpeg"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/events/main/static/image/3.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/events/main/static/image/4.png"
+    }
+  ],
+  "description_md": "https://raw.githubusercontent.com/lnbits/events/main/description.md",
+  "terms_and_conditions_md": "https://raw.githubusercontent.com/lnbits/events/main/toc.md",
+  "license": "MIT"
 }

crud.py

@@ -1,184 +1,114 @@
-from typing import List, Optional, Union
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
+from typing import Optional, Union
 
+from lnbits.db import Database
 from lnbits.helpers import urlsafe_short_hash
 
-from . import db
 from .models import CreateEvent, Event, Ticket
 
-# TICKETS
+db = Database("ext_events")
 
 
 async def create_ticket(
     payment_hash: str, wallet: str, event: str, name: str, email: str
 ) -> Ticket:
-    await db.execute(
-        """
-        INSERT INTO events.ticket (id, wallet, event, name, email, registered, paid)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        """,
-        (payment_hash, wallet, event, name, email, False, False),
+    now = datetime.now(timezone.utc)
+    ticket = Ticket(
+        id=payment_hash,
+        wallet=wallet,
+        event=event,
+        name=name,
+        email=email,
+        registered=False,
+        paid=False,
+        reg_timestamp=now,
+        time=now,
     )
-
-    ticket = await get_ticket(payment_hash)
-    assert ticket, "Newly created ticket couldn't be retrieved"
+    await db.insert("events.ticket", ticket)
     return ticket
 
 
-async def set_ticket_paid(payment_hash: str) -> Ticket:
-    ticket = await get_ticket(payment_hash)
-    assert ticket, "Ticket couldn't be retrieved"
-    if ticket.paid:
-        return ticket
-
-    await db.execute(
-        """
-        UPDATE events.ticket
-        SET paid = ?
-        WHERE id = ?
-        """,
-        (True, ticket.id),
-    )
-
-    await update_event_sold(ticket.event)
-
+async def update_ticket(ticket: Ticket) -> Ticket:
+    await db.update("events.ticket", ticket)
     return ticket
 
 
-async def update_event_sold(event_id: str):
-    event = await get_event(event_id)
-    assert event, "Couldn't get event from ticket being paid"
-    sold = event.sold + 1
-    amount_tickets = event.amount_tickets - 1
-    await db.execute(
-        """
-        UPDATE events.events
-        SET sold = ?, amount_tickets = ?
-        WHERE id = ?
-        """,
-        (sold, amount_tickets, event_id),
-    )
-
-    return
-
-
 async def get_ticket(payment_hash: str) -> Optional[Ticket]:
-    row = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (payment_hash,))
-    return Ticket(**row) if row else None
+    return await db.fetchone(
+        "SELECT * FROM events.ticket WHERE id = :id",
+        {"id": payment_hash},
+        Ticket,
+    )
 
 
-async def get_tickets(wallet_ids: Union[str, List[str]]) -> List[Ticket]:
+async def get_tickets(wallet_ids: Union[str, list[str]]) -> list[Ticket]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM events.ticket WHERE wallet IN ({q})", (*wallet_ids,)
+    q = ",".join([f"'{wallet_id}'" for wallet_id in wallet_ids])
+    return await db.fetchall(
+        f"SELECT * FROM events.ticket WHERE wallet IN ({q})",
+        model=Ticket,
     )
-    return [Ticket(**row) for row in rows]
 
 
 async def delete_ticket(payment_hash: str) -> None:
-    await db.execute("DELETE FROM events.ticket WHERE id = ?", (payment_hash,))
+    await db.execute("DELETE FROM events.ticket WHERE id = :id", {"id": payment_hash})
 
 
 async def delete_event_tickets(event_id: str) -> None:
-    await db.execute("DELETE FROM events.ticket WHERE event = ?", (event_id,))
+    await db.execute(
+        "DELETE FROM events.ticket WHERE event = :event", {"event": event_id}
+    )
 
 
 async def purge_unpaid_tickets(event_id: str) -> None:
     time_diff = datetime.now() - timedelta(hours=24)
     await db.execute(
         f"""
-        DELETE FROM events.ticket WHERE event = ? AND paid = false AND time < {db.timestamp_placeholder}
+        DELETE FROM events.ticket WHERE event = :event AND paid = false
+        AND time < {db.timestamp_placeholder("time")}
         """,
-        (
-            event_id,
-            time_diff.timestamp(),
-        ),
+        {"time": time_diff.timestamp(), "event": event_id},
     )
 
 
-# EVENTS
-
-
 async def create_event(data: CreateEvent) -> Event:
     event_id = urlsafe_short_hash()
-    await db.execute(
-        """
-        INSERT INTO events.events (id, wallet, name, info, banner, closing_date, event_start_date, event_end_date, currency, amount_tickets, price_per_ticket, sold)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (
-            event_id,
-            data.wallet,
-            data.name,
-            data.info,
-            data.banner,
-            data.closing_date,
-            data.event_start_date,
-            data.event_end_date,
-            data.currency,
-            data.amount_tickets,
-            data.price_per_ticket,
-            0,
-        ),
-    )
-
-    event = await get_event(event_id)
-    assert event, "Newly created event couldn't be retrieved"
+    event = Event(id=event_id, time=datetime.now(timezone.utc), **data.dict())
+    await db.insert("events.events", event)
     return event
 
 
-async def update_event(event_id: str, **kwargs) -> Event:
-    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(
-        f"UPDATE events.events SET {q} WHERE id = ?", (*kwargs.values(), event_id)
-    )
-    event = await get_event(event_id)
-    assert event, "Newly updated event couldn't be retrieved"
+async def update_event(event: Event) -> Event:
+    await db.update("events.events", event)
     return event
 
 
 async def get_event(event_id: str) -> Optional[Event]:
-    row = await db.fetchone("SELECT * FROM events.events WHERE id = ?", (event_id,))
-    return Event(**row) if row else None
-
-
-async def get_events(wallet_ids: Union[str, List[str]]) -> List[Event]:
-    if isinstance(wallet_ids, str):
-        wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM events.events WHERE wallet IN ({q})", (*wallet_ids,)
+    return await db.fetchone(
+        "SELECT * FROM events.events WHERE id = :id",
+        {"id": event_id},
+        Event,
     )
 
-    return [Event(**row) for row in rows]
+
+async def get_events(wallet_ids: Union[str, list[str]]) -> list[Event]:
+    if isinstance(wallet_ids, str):
+        wallet_ids = [wallet_ids]
+    q = ",".join([f"'{wallet_id}'" for wallet_id in wallet_ids])
+    return await db.fetchall(
+        f"SELECT * FROM events.events WHERE wallet IN ({q})",
+        model=Event,
+    )
 
 
 async def delete_event(event_id: str) -> None:
-    await db.execute("DELETE FROM events.events WHERE id = ?", (event_id,))
+    await db.execute("DELETE FROM events.events WHERE id = :id", {"id": event_id})
 
 
-# EVENTTICKETS
-
-
-async def get_event_tickets(event_id: str, wallet_id: str) -> List[Ticket]:
-    rows = await db.fetchall(
-        "SELECT * FROM events.ticket WHERE wallet = ? AND event = ?",
-        (wallet_id, event_id),
+async def get_event_tickets(event_id: str) -> list[Ticket]:
+    return await db.fetchall(
+        "SELECT * FROM events.ticket WHERE event = :event",
+        {"event": event_id},
+        Ticket,
     )
-    return [Ticket(**row) for row in rows]
-
-
-async def reg_ticket(ticket_id: str) -> List[Ticket]:
-    await db.execute(
-        f"UPDATE events.ticket SET registered = ?, reg_timestamp = {db.timestamp_now} WHERE id = ?",
-        (True, ticket_id),
-    )
-    ticket = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (ticket_id,))
-    rows = await db.fetchall(
-        "SELECT * FROM events.ticket WHERE event = ?", (ticket[1],)
-    )
-    return [Ticket(**row) for row in rows]

description.md

@@ -0,0 +1,5 @@
+Sell tickets for events and use the built-in scanner for registering attendants
+
+Events alows you to make tickets for an event. Each ticket is in the form of a uniqque QR code. After registering, and paying for ticket, the user gets a QR code to present at registration/entrance.
+
+Events includes a shareable ticket scanner, which can be used to register attendees.

models.py

@@ -1,19 +1,21 @@
+from datetime import datetime
+from typing import Optional
+
 from fastapi import Query
 from pydantic import BaseModel, EmailStr
-from typing import Optional
 
 
 class CreateEvent(BaseModel):
     wallet: str
     name: str
     info: str
-    banner: Optional[str]
     closing_date: str
     event_start_date: str
     event_end_date: str
     currency: str = "sat"
     amount_tickets: int = Query(..., ge=0)
     price_per_ticket: float = Query(..., ge=0)
+    banner: Optional[str] = None
 
 
 class CreateTicket(BaseModel):
@@ -26,15 +28,15 @@ class Event(BaseModel):
     wallet: str
     name: str
     info: str
-    banner: Optional[str]
     closing_date: str
     event_start_date: str
     event_end_date: str
     currency: str
     amount_tickets: int
     price_per_ticket: float
-    sold: int
-    time: int
+    time: datetime
+    sold: int = 0
+    banner: Optional[str] = None
 
 
 class Ticket(BaseModel):
@@ -44,6 +46,6 @@ class Ticket(BaseModel):
     name: str
     email: str
     registered: bool
-    reg_timestamp: Optional[int]
     paid: bool
-    time: int
+    time: datetime
+    reg_timestamp: datetime

package-lock.json

@@ -0,0 +1,59 @@
+{
+  "name": "events",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "events",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "prettier": "^3.2.5",
+        "pyright": "^1.1.358"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/pyright": {
+      "version": "1.1.374",
+      "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.374.tgz",
+      "integrity": "sha512-ISbC1YnYDYrEatoKKjfaA5uFIp0ddC/xw9aSlN/EkmwupXUMVn41Jl+G6wHEjRhC+n4abHZeGpEvxCUus/K9dA==",
+      "bin": {
+        "pyright": "index.js",
+        "pyright-langserver": "langserver.index.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    }
+  }
+}

package.json

@@ -0,0 +1,15 @@
+{
+  "name": "events",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "prettier": "^3.2.5",
+    "pyright": "^1.1.358"
+  }
+}

pyproject.toml

@@ -0,0 +1,94 @@
+[tool.poetry]
+name = "lnbits-events"
+version = "0.0.0"
+description = "LNbits, free and open-source Lightning wallet and accounts system."
+authors = ["Alan Bits <alan@lnbits.com>"]
+
+[tool.poetry.dependencies]
+python = "^3.10 | ^3.9"
+lnbits = {version = "*", allow-prereleases = true}
+
+[tool.poetry.group.dev.dependencies]
+black = "^24.3.0"
+pytest-asyncio = "^0.21.0"
+pytest = "^7.3.2"
+mypy = "^1.5.1"
+pre-commit = "^3.2.2"
+ruff = "^0.3.2"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.mypy]
+exclude = "(nostr/*)"
+[[tool.mypy.overrides]]
+module = [
+  "lnbits.*",
+  "lnurl.*",
+  "loguru.*",
+  "fastapi.*",
+  "pydantic.*",
+  "pyqrcode.*",
+  "shortuuid.*",
+  "httpx.*",
+]
+ignore_missing_imports = "True"
+
+[tool.pytest.ini_options]
+log_cli = false
+testpaths = [
+  "tests"
+]
+
+[tool.black]
+line-length = 88
+
+[tool.ruff]
+# Same as Black. + 10% rule of black
+line-length = 88
+exclude = [
+    "nostr",
+]
+
+[tool.ruff.lint]
+# Enable:
+# F - pyflakes
+# E - pycodestyle errors
+# W - pycodestyle warnings
+# I - isort
+# A - flake8-builtins
+# C - mccabe
+# N - naming
+# UP - pyupgrade
+# RUF - ruff
+# B - bugbear
+select = ["F", "E", "W", "I", "A", "C", "N", "UP", "RUF", "B"]
+ignore = ["C901"]
+
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+# needed for pydantic
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = [
+    "root_validator",
+]
+
+# Ignore unused imports in __init__.py files.
+# [tool.ruff.lint.extend-per-file-ignores]
+# "__init__.py" = ["F401", "F403"]
+
+# [tool.ruff.lint.mccabe]
+# max-complexity = 10
+
+[tool.ruff.lint.flake8-bugbear]
+# Allow default arguments like, e.g., `data: List[str] = fastapi.Query(None)`.
+extend-immutable-calls = [
+    "fastapi.Depends",
+    "fastapi.Query",
+]

services.py

@@ -0,0 +1,18 @@
+from .crud import get_event, update_event, update_ticket
+from .models import Ticket
+
+
+async def set_ticket_paid(ticket: Ticket) -> Ticket:
+    if ticket.paid:
+        return ticket
+
+    ticket.paid = True
+    await update_ticket(ticket)
+
+    event = await get_event(ticket.event)
+    assert event, "Couldn't get event from ticket being paid"
+    event.sold += 1
+    event.amount_tickets -= 1
+    await update_event(event)
+
+    return ticket

static/js/display.js

@@ -0,0 +1,134 @@
+window.app = Vue.createApp({
+  el: '#vue',
+  mixins: [windowMixin],
+  data() {
+    return {
+      paymentReq: null,
+      redirectUrl: null,
+      formDialog: {
+        show: false,
+        data: {
+          name: '',
+          email: ''
+        }
+      },
+      ticketLink: {
+        show: false,
+        data: {
+          link: ''
+        }
+      },
+      receive: {
+        show: false,
+        status: 'pending',
+        paymentReq: null
+      }
+    }
+  },
+  async created() {
+    this.info = event_info
+    this.info = this.info.substring(1, this.info.length - 1)
+    this.banner = event_banner
+    await this.purgeUnpaidTickets()
+  },
+  computed: {
+    formatDescription() {
+      return LNbits.utils.convertMarkdown(this.info)
+    }
+  },
+  methods: {
+    resetForm(e) {
+      e.preventDefault()
+      this.formDialog.data.name = ''
+      this.formDialog.data.email = ''
+    },
+
+    closeReceiveDialog() {
+      const checker = this.receive.paymentChecker
+      dismissMsg()
+      clearInterval(paymentChecker)
+      setTimeout(() => {}, 10000)
+    },
+    nameValidation(val) {
+      const regex = /[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/g
+      return (
+        !regex.test(val) ||
+        'Please enter valid name. No special character allowed.'
+      )
+    },
+    emailValidation(val) {
+      const regex = /^[\w\.-]+@[a-zA-Z\d\.-]+\.[a-zA-Z]{2,}$/
+      return regex.test(val) || 'Please enter valid email.'
+    },
+
+    Invoice() {
+      axios
+        .post(`/events/api/v1/tickets/${event_id}`, {
+          name: this.formDialog.data.name,
+          email: this.formDialog.data.email
+        })
+        .then(response => {
+          this.paymentReq = response.data.payment_request
+          this.paymentCheck = response.data.payment_hash
+
+          dismissMsg = Quasar.Notify.create({
+            timeout: 0,
+            message: 'Waiting for payment...'
+          })
+
+          this.receive = {
+            show: true,
+            status: 'pending',
+            paymentReq: this.paymentReq
+          }
+          paymentChecker = setInterval(() => {
+            axios
+              .post(`/events/api/v1/tickets/${event_id}/${this.paymentCheck}`, {
+                event: event_id,
+                event_name: event_name,
+                name: this.formDialog.data.name,
+                email: this.formDialog.data.email
+              })
+              .then(res => {
+                if (res.data.paid) {
+                  clearInterval(paymentChecker)
+                  dismissMsg()
+                  this.formDialog.data.name = ''
+                  this.formDialog.data.email = ''
+
+                  Quasar.Notify.create({
+                    type: 'positive',
+                    message: 'Sent, thank you!',
+                    icon: null
+                  })
+                  this.receive = {
+                    show: false,
+                    status: 'complete',
+                    paymentReq: null
+                  }
+
+                  this.ticketLink = {
+                    show: true,
+                    data: {
+                      link: `/events/ticket/${res.data.ticket_id}`
+                    }
+                  }
+                  setTimeout(() => {
+                    window.location.href = `/events/ticket/${res.data.ticket_id}`
+                  }, 5000)
+                }
+              })
+              .catch(LNbits.utils.notifyApiError)
+          }, 2000)
+        })
+        .catch(LNbits.utils.notifyApiError)
+    },
+    async purgeUnpaidTickets() {
+      try {
+        await LNbits.api.request('GET', `/events/api/v1/purge/${event_id}`)
+      } catch (error) {
+        LNbits.utils.notifyApiError(error)
+      }
+    }
+  }
+})

static/js/index.js

@@ -0,0 +1,228 @@
+const mapEvents = function (obj) {
+  obj.date = Quasar.date.formatDate(
+    new Date(obj.time * 1000),
+    'YYYY-MM-DD HH:mm'
+  )
+  obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.price_per_ticket)
+  obj.displayUrl = ['/events/', obj.id].join('')
+  return obj
+}
+
+window.app = Vue.createApp({
+  el: '#vue',
+  mixins: [windowMixin],
+  data() {
+    return {
+      events: [],
+      tickets: [],
+      currencies: [],
+      eventsTable: {
+        columns: [
+          {name: 'id', align: 'left', label: 'ID', field: 'id'},
+          {name: 'name', align: 'left', label: 'Name', field: 'name'},
+          {name: 'info', align: 'left', label: 'Info', field: 'info'},
+          {name: 'banner', align: 'left', label: 'Banner', field: 'banner'},
+          {
+            name: 'event_start_date',
+            align: 'left',
+            label: 'Start date',
+            field: 'event_start_date'
+          },
+          {
+            name: 'event_end_date',
+            align: 'left',
+            label: 'End date',
+            field: 'event_end_date'
+          },
+          {
+            name: 'closing_date',
+            align: 'left',
+            label: 'Ticket close',
+            field: 'closing_date'
+          },
+          {
+            name: 'price_per_ticket',
+            align: 'left',
+            label: 'Price',
+            field: row => {
+              if (row.currency != 'sats') {
+                return LNbits.utils.formatCurrency(
+                  row.price_per_ticket.toFixed(2),
+                  row.currency
+                )
+              }
+              return row.price_per_ticket
+            }
+          },
+          {
+            name: 'amount_tickets',
+            align: 'left',
+            label: 'No tickets',
+            field: 'amount_tickets'
+          },
+          {
+            name: 'sold',
+            align: 'left',
+            label: 'Sold',
+            field: 'sold'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      ticketsTable: {
+        columns: [
+          {name: 'id', align: 'left', label: 'ID', field: 'id'},
+          {name: 'event', align: 'left', label: 'Event', field: 'event'},
+          {name: 'name', align: 'left', label: 'Name', field: 'name'},
+          {name: 'email', align: 'left', label: 'Email', field: 'email'},
+          {
+            name: 'registered',
+            align: 'left',
+            label: 'Registered',
+            field: 'registered'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      formDialog: {
+        show: false,
+        data: {}
+      }
+    }
+  },
+  methods: {
+    getTickets() {
+      LNbits.api
+        .request(
+          'GET',
+          '/events/api/v1/tickets?all_wallets=true',
+          this.g.user.wallets[0].inkey
+        )
+        .then(response => {
+          this.tickets = response.data
+            .map(function (obj) {
+              return mapEvents(obj)
+            })
+            .filter(e => e.paid)
+        })
+    },
+    deleteTicket(ticketId) {
+      const tickets = _.findWhere(this.tickets, {id: ticketId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this ticket')
+        .onOk(() => {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/events/api/v1/tickets/' + ticketId,
+              _.findWhere(this.g.user.wallets, {id: tickets.wallet}).inkey
+            )
+            .then(response => {
+              this.tickets = _.reject(this.tickets, function (obj) {
+                return obj.id == ticketId
+              })
+            })
+            .catch(function (error) {
+              LNbits.utils.notifyApiError(error)
+            })
+        })
+    },
+    exportticketsCSV() {
+      LNbits.utils.exportCSV(this.ticketsTable.columns, this.tickets)
+    },
+    getEvents() {
+      LNbits.api
+        .request(
+          'GET',
+          '/events/api/v1/events?all_wallets=true',
+          this.g.user.wallets[0].inkey
+        )
+        .then(response => {
+          this.events = response.data.map(function (obj) {
+            return mapEvents(obj)
+          })
+        })
+    },
+    sendEventData() {
+      const wallet = _.findWhere(this.g.user.wallets, {
+        id: this.formDialog.data.wallet
+      })
+      const data = this.formDialog.data
+
+      if (data.id) {
+        this.updateEvent(wallet, data)
+      } else {
+        this.createEvent(wallet, data)
+      }
+    },
+
+    createEvent(wallet, data) {
+      LNbits.api
+        .request('POST', '/events/api/v1/events', wallet.adminkey, data)
+        .then(response => {
+          this.events.push(mapEvents(response.data))
+          this.formDialog.show = false
+          this.formDialog.data = {}
+        })
+        .catch(LNbits.utils.notifyApiError)
+    },
+    updateformDialog(formId) {
+      const link = _.findWhere(this.events, {id: formId})
+      this.formDialog.data = {...link}
+      this.formDialog.show = true
+    },
+    updateEvent(wallet, data) {
+      LNbits.api
+        .request(
+          'PUT',
+          '/events/api/v1/events/' + data.id,
+          wallet.adminkey,
+          data
+        )
+        .then(response => {
+          this.events = _.reject(this.events, function (obj) {
+            return obj.id == data.id
+          })
+          this.events.push(mapEvents(response.data))
+          this.formDialog.show = false
+          this.formDialog.data = {}
+        })
+        .catch(LNbits.utils.notifyApiError)
+    },
+    deleteEvent(eventsId) {
+      const events = _.findWhere(this.events, {id: eventsId})
+
+      LNbits.utils
+        .confirmDialog('Are you sure you want to delete this form link?')
+        .onOk(() => {
+          LNbits.api
+            .request(
+              'DELETE',
+              '/events/api/v1/events/' + eventsId,
+              _.findWhere(this.g.user.wallets, {id: events.wallet}).adminkey
+            )
+            .then(response => {
+              this.events = _.reject(this.events, function (obj) {
+                return obj.id == eventsId
+              })
+            })
+            .catch(LNbits.utils.notifyApiError(error))
+        })
+    },
+    exporteventsCSV() {
+      LNbits.utils.exportCSV(this.eventsTable.columns, this.events)
+    }
+  },
+  async created() {
+    if (this.g.user.wallets.length) {
+      this.getTickets()
+      this.getEvents()
+      this.currencies = await LNbits.api.getCurrencies()
+    }
+  }
+})

static/js/register.js

@@ -0,0 +1,78 @@
+const mapEvents = function (obj) {
+  obj.date = Quasar.date.formatDate(
+    new Date(obj.time * 1000),
+    'YYYY-MM-DD HH:mm'
+  )
+  obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.amount)
+  obj.displayUrl = ['/events/', obj.id].join('')
+  return obj
+}
+
+window.app = Vue.createApp({
+  el: '#vue',
+  mixins: [windowMixin],
+  data() {
+    return {
+      tickets: [],
+      ticketsTable: {
+        columns: [
+          {name: 'id', align: 'left', label: 'ID', field: 'id'},
+          {name: 'name', align: 'left', label: 'Name', field: 'name'},
+          {
+            name: 'registered',
+            align: 'left',
+            label: 'Registered',
+            field: 'registered'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      sendCamera: {
+        show: false,
+        camera: 'auto'
+      }
+    }
+  },
+  methods: {
+    hoverEmail(tmp) {
+      this.tickets.data.emailtemp = tmp
+    },
+    closeCamera() {
+      this.sendCamera.show = false
+    },
+    showCamera() {
+      this.sendCamera.show = true
+    },
+    decodeQR(res) {
+      this.sendCamera.show = false
+      const value = res[0].rawValue.split('//')[1]
+      LNbits.api
+        .request('GET', `/events/api/v1/register/ticket/${value}`)
+        .then(() => {
+          Quasar.Notify.create({
+            type: 'positive',
+            message: 'Registered!'
+          })
+          setTimeout(() => {
+            window.location.reload()
+          }, 2000)
+        })
+        .catch(LNbits.utils.notifyApiError)
+    },
+    getEventTickets() {
+      LNbits.api
+        .request('GET', `/events/api/v1/eventtickets/${event_id}`)
+        .then(response => {
+          this.tickets = response.data.map(obj => {
+            return mapEvents(obj)
+          })
+        })
+        .catch(LNbits.utils.notifyApiError)
+    }
+  },
+  created() {
+    this.getEventTickets()
+  }
+})

tasks.py

@@ -1,15 +1,16 @@
 import asyncio
 
 from lnbits.core.models import Payment
-from lnbits.helpers import get_current_extension_name
 from lnbits.tasks import register_invoice_listener
+from loguru import logger
 
-from .crud import set_ticket_paid
+from .crud import get_ticket
+from .services import set_ticket_paid
 
 
 async def wait_for_paid_invoices():
     invoice_queue = asyncio.Queue()
-    register_invoice_listener(invoice_queue, get_current_extension_name())
+    register_invoice_listener(invoice_queue, "ext_events")
 
     while True:
         payment = await invoice_queue.get()
@@ -17,12 +18,16 @@ async def wait_for_paid_invoices():
 
 
 async def on_invoice_paid(payment: Payment) -> None:
-    # (avoid loops)
-    if (
-        payment.extra
-        and "events" == payment.extra.get("tag")
-        and payment.extra.get("name")
-        and payment.extra.get("email")
-    ):
-        await set_ticket_paid(payment.payment_hash)
-    return
+    if not payment.extra or "events" != payment.extra.get("tag"):
+        return
+
+    if not payment.extra.get("name") or not payment.extra.get("email"):
+        logger.warning(f"Ticket {payment.payment_hash} missing name or email.")
+        return
+
+    ticket = await get_ticket(payment.payment_hash)
+    if not ticket:
+        logger.warning(f"Ticket for payment {payment.payment_hash} not found.")
+        return
+
+    await set_ticket_paid(ticket)

templates/events/display.html

@@ -73,13 +73,9 @@
     <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <div class="text-center q-mb-lg">
         <a class="text-secondary" :href="'lightning:' + receive.paymentReq">
-          <q-responsive :ratio="1" class="q-mx-xl">
-            <qrcode
-              :value="'lightning:' + receive.paymentReq.toUpperCase()"
-              :options="{width: 340}"
-              class="rounded-borders"
-            ></qrcode>
-          </q-responsive>
+          <lnbits-qrcode
+            :value="'lightning:' + receive.paymentReq.toUpperCase()"
+          ></lnbits-qrcode>
         </a>
       </div>
       <div class="row q-mt-lg">
@@ -94,152 +90,10 @@
 
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        paymentReq: null,
-        redirectUrl: null,
-        formDialog: {
-          show: false,
-          data: {
-            name: '',
-            email: ''
-          }
-        },
-        ticketLink: {
-          show: false,
-          data: {
-            link: ''
-          }
-        },
-        receive: {
-          show: false,
-          status: 'pending',
-          paymentReq: null
-        }
-      }
-    },
-    async created() {
-      this.info = '{{ event_info | tojson }}'
-      this.info = this.info.substring(1, this.info.length - 1)
-      this.banner = JSON.parse('{{ event_banner | tojson |safe }}')
-      await this.purgeUnpaidTickets()
-    },
-    computed: {
-      formatDescription() {
-        return LNbits.utils.convertMarkdown(this.info)
-      }
-    },
-    methods: {
-      resetForm: function (e) {
-        e.preventDefault()
-        this.formDialog.data.name = ''
-        this.formDialog.data.email = ''
-      },
-
-      closeReceiveDialog: function () {
-        var checker = this.receive.paymentChecker
-        dismissMsg()
-
-        clearInterval(paymentChecker)
-        setTimeout(function () {}, 10000)
-      },
-      nameValidation(val) {
-        const regex = /[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/g
-        return (
-          !regex.test(val) ||
-          'Please enter valid name. No special character allowed.'
-        )
-      },
-      emailValidation(val) {
-        let regex = /^[\w\.-]+@[a-zA-Z\d\.-]+\.[a-zA-Z]{2,}$/
-        return regex.test(val) || 'Please enter valid email.'
-      },
-
-      Invoice: function () {
-        var self = this
-        axios
-          .post(`/events/api/v1/tickets/{{ event_id }}`, {
-            name: self.formDialog.data.name,
-            email: self.formDialog.data.email
-          })
-          .then(function (response) {
-            self.paymentReq = response.data.payment_request
-            self.paymentCheck = response.data.payment_hash
-
-            dismissMsg = self.$q.notify({
-              timeout: 0,
-              message: 'Waiting for payment...'
-            })
-
-            self.receive = {
-              show: true,
-              status: 'pending',
-              paymentReq: self.paymentReq
-            }
-
-            paymentChecker = setInterval(function () {
-              axios
-                .post(
-                  `/events/api/v1/tickets/{{ event_id }}/${self.paymentCheck}`,
-                  {
-                    event: '{{ event_id }}',
-                    event_name: '{{ event_name }}',
-                    name: self.formDialog.data.name,
-                    email: self.formDialog.data.email
-                  }
-                )
-                .then(function (res) {
-                  if (res.data.paid) {
-                    clearInterval(paymentChecker)
-                    dismissMsg()
-                    self.formDialog.data.name = ''
-                    self.formDialog.data.email = ''
-
-                    self.$q.notify({
-                      type: 'positive',
-                      message: 'Sent, thank you!',
-                      icon: null
-                    })
-                    self.receive = {
-                      show: false,
-                      status: 'complete',
-                      paymentReq: null
-                    }
-
-                    self.ticketLink = {
-                      show: true,
-                      data: {
-                        link: `/events/ticket/${res.data.ticket_id}`
-                      }
-                    }
-                    setTimeout(function () {
-                      window.location.href = `/events/ticket/${res.data.ticket_id}`
-                    }, 5000)
-                  }
-                })
-                .catch(function (error) {
-                  LNbits.utils.notifyApiError(error)
-                })
-            }, 2000)
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      async purgeUnpaidTickets() {
-        try {
-          await LNbits.api.request('GET', `/events/api/v1/purge/{{ event_id }}`)
-        } catch (error) {
-          console.warn(error)
-          LNbits.utils.notifyApiError(error)
-        }
-      }
-    }
-  })
+  const event_id = '{{ event_id }}'
+  const event_name = '{{ event_name }}'
+  const event_info = '{{ event_info | tojson }}'
+  const event_banner = JSON.parse('{{ event_banner | tojson | safe }}')
 </script>
+<script src="{{ static_url_for('events/static', path='js/display.js') }}"></script>
 {% endblock %}

templates/events/error.html

@@ -18,18 +18,14 @@
       </q-card-section>
     </q-card>
   </div>
-
-  {% endblock %} {% block scripts %}
-
-  <script>
-    new Vue({
-      el: '#vue',
-      mixins: [windowMixin],
-      data: function () {
-        return {}
-      }
-    })
-  </script>
-
-  {% endblock %}
 </div>
+{% endblock %} {% block scripts %}
+
+<script>
+  window.app = Vue.createApp({
+    el: '#vue',
+    mixins: [windowMixin]
+  })
+</script>
+
+{% endblock %}

templates/events/index.html

@@ -25,18 +25,17 @@
         <q-table
           dense
           flat
-          :data="events"
+          :rows="events"
           row-key="id"
           :columns="eventsTable.columns"
-          :pagination.sync="eventsTable.pagination"
+          v-model:pagination="eventsTable.pagination"
         >
-          {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width></q-th>
 
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
+                <span v-text="col.label"></span>
               </q-th>
 
               <q-th auto-width></q-th>
@@ -67,7 +66,7 @@
                 ></q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
+                <span v-text="col.value"></span>
               </q-td>
               <q-td auto-width>
                 <q-btn
@@ -91,7 +90,6 @@
               </q-td>
             </q-tr>
           </template>
-          {% endraw %}
         </q-table>
       </q-card-section>
     </q-card>
@@ -111,17 +109,16 @@
         <q-table
           dense
           flat
-          :data="tickets"
+          :rows="tickets"
           row-key="id"
           :columns="ticketsTable.columns"
-          :pagination.sync="ticketsTable.pagination"
+          v-model:pagination="ticketsTable.pagination"
         >
-          {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width></q-th>
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
+                <span v-text="col.label"></span>
               </q-th>
             </q-tr>
           </template>
@@ -141,7 +138,7 @@
               </q-td>
 
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
+                <span v-text="col.value"></span>
               </q-td>
 
               <q-td auto-width>
@@ -156,7 +153,6 @@
               </q-td>
             </q-tr>
           </template>
-          {% endraw %}
         </q-table>
       </q-card-section>
     </q-card>
@@ -280,8 +276,8 @@
               v-model.number="formDialog.data.price_per_ticket"
               type="number"
               :label="'Price (' + formDialog.data.currency + ') *'"
-              :step="formDialog.data.currency != 'sat' ? '0.01' : '1'"
-              :mask="formDialog.data.currency != 'sat' ? '#.##' : '#'"
+              :step="formDialog.data.currency != 'sats' ? '0.01' : '1'"
+              :mask="formDialog.data.currency != 'sats' ? '#.##' : '#'"
               fill-mask="0"
               reverse-fill-mask
             ></q-input>
@@ -318,264 +314,5 @@
     overflow-x: hidden;
   }
 </style>
-<script>
-  var mapEvents = function (obj) {
-    obj.date = Quasar.utils.date.formatDate(
-      new Date(obj.time * 1000),
-      'YYYY-MM-DD HH:mm'
-    )
-    obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.amount)
-    obj.displayUrl = ['/events/', obj.id].join('')
-    return obj
-  }
-
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        events: [],
-        tickets: [],
-        currencies: [],
-        eventsTable: {
-          columns: [
-            {name: 'id', align: 'left', label: 'ID', field: 'id'},
-            {name: 'name', align: 'left', label: 'Name', field: 'name'},
-            {name: 'info', align: 'left', label: 'Info', field: 'info'},
-            {name: 'banner', align: 'left', label: 'Banner', field: 'banner'},
-            {
-              name: 'event_start_date',
-              align: 'left',
-              label: 'Start date',
-              field: 'event_start_date'
-            },
-            {
-              name: 'event_end_date',
-              align: 'left',
-              label: 'End date',
-              field: 'event_end_date'
-            },
-            {
-              name: 'closing_date',
-              align: 'left',
-              label: 'Ticket close',
-              field: 'closing_date'
-            },
-            {
-              name: 'price_per_ticket',
-              align: 'left',
-              label: 'Price',
-              field: row => {
-                if (row.currency != 'sat') {
-                  return LNbits.utils.formatCurrency(
-                    row.price_per_ticket.toFixed(2),
-                    row.currency
-                  )
-                }
-                return row.price_per_ticket
-              }
-            },
-            {
-              name: 'amount_tickets',
-              align: 'left',
-              label: 'No tickets',
-              field: 'amount_tickets'
-            },
-            {
-              name: 'sold',
-              align: 'left',
-              label: 'Sold',
-              field: 'sold'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        ticketsTable: {
-          columns: [
-            {name: 'id', align: 'left', label: 'ID', field: 'id'},
-            {name: 'event', align: 'left', label: 'Event', field: 'event'},
-            {name: 'name', align: 'left', label: 'Name', field: 'name'},
-            {name: 'email', align: 'left', label: 'Email', field: 'email'},
-            {
-              name: 'registered',
-              align: 'left',
-              label: 'Registered',
-              field: 'registered'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        formDialog: {
-          show: false,
-          data: {}
-        }
-      }
-    },
-    methods: {
-      getTickets: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/events/api/v1/tickets?all_wallets=true',
-            this.g.user.wallets[0].inkey
-          )
-          .then(function (response) {
-            self.tickets = response.data
-              .map(function (obj) {
-                return mapEvents(obj)
-              })
-              .filter(e => e.paid)
-          })
-      },
-      deleteTicket: function (ticketId) {
-        var self = this
-        var tickets = _.findWhere(this.tickets, {id: ticketId})
-
-        LNbits.utils
-          .confirmDialog('Are you sure you want to delete this ticket')
-          .onOk(function () {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/events/api/v1/tickets/' + ticketId,
-                _.findWhere(self.g.user.wallets, {id: tickets.wallet}).inkey
-              )
-              .then(function (response) {
-                self.tickets = _.reject(self.tickets, function (obj) {
-                  return obj.id == ticketId
-                })
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      exportticketsCSV: function () {
-        LNbits.utils.exportCSV(this.ticketsTable.columns, this.tickets)
-      },
-      getEvents: function () {
-        var self = this
-
-        LNbits.api
-          .request(
-            'GET',
-            '/events/api/v1/events?all_wallets=true',
-            this.g.user.wallets[0].inkey
-          )
-          .then(function (response) {
-            self.events = response.data.map(function (obj) {
-              return mapEvents(obj)
-            })
-          })
-      },
-      sendEventData: function () {
-        var wallet = _.findWhere(this.g.user.wallets, {
-          id: this.formDialog.data.wallet
-        })
-        var data = this.formDialog.data
-
-        if (data.id) {
-          this.updateEvent(wallet, data)
-        } else {
-          this.createEvent(wallet, data)
-        }
-      },
-
-      createEvent: function (wallet, data) {
-        var self = this
-        LNbits.api
-          .request('POST', '/events/api/v1/events', wallet.adminkey, data)
-          .then(function (response) {
-            self.events.push(mapEvents(response.data))
-            self.formDialog.show = false
-            self.formDialog.data = {}
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      updateformDialog: function (formId) {
-        var link = _.findWhere(this.events, {id: formId})
-
-        this.formDialog.data = {...link}
-
-        this.formDialog.show = true
-      },
-      updateEvent: function (wallet, data) {
-        var self = this
-
-        LNbits.api
-          .request(
-            'PUT',
-            '/events/api/v1/events/' + data.id,
-            wallet.adminkey,
-            data
-          )
-          .then(function (response) {
-            self.events = _.reject(self.events, function (obj) {
-              return obj.id == data.id
-            })
-            self.events.push(mapEvents(response.data))
-            self.formDialog.show = false
-            self.formDialog.data = {}
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      deleteEvent: function (eventsId) {
-        var self = this
-        var events = _.findWhere(this.events, {id: eventsId})
-
-        LNbits.utils
-          .confirmDialog('Are you sure you want to delete this form link?')
-          .onOk(function () {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/events/api/v1/events/' + eventsId,
-                _.findWhere(self.g.user.wallets, {id: events.wallet}).adminkey
-              )
-              .then(function (response) {
-                self.events = _.reject(self.events, function (obj) {
-                  return obj.id == eventsId
-                })
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      exporteventsCSV: function () {
-        LNbits.utils.exportCSV(this.eventsTable.columns, this.events)
-      },
-      async getCurrencies() {
-        try {
-          const {data} = await LNbits.api.request(
-            'GET',
-            '/events/api/v1/currencies',
-            this.inkey
-          )
-
-          this.currencies = ['sat', ...data]
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-        }
-      }
-    },
-
-    created: async function () {
-      if (this.g.user.wallets.length) {
-        this.getTickets()
-        this.getEvents()
-        await this.getCurrencies()
-      }
-    }
-  })
-</script>
+<script src="{{ static_url_for('events/static', path='js/index.js') }}"></script>
 {% endblock %}

templates/events/register.html

@@ -22,17 +22,16 @@
         <q-table
           dense
           flat
-          :data="tickets"
+          :rows="tickets"
           row-key="id"
           :columns="ticketsTable.columns"
-          :pagination.sync="ticketsTable.pagination"
+          v-model:pagination="ticketsTable.pagination"
         >
-          {% raw %}
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width></q-th>
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
+                <span v-text="col.label"></span>
               </q-th>
             </q-tr>
           </template>
@@ -52,11 +51,10 @@
               </q-td>
 
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
+                <span v-text="col.value"></span>
               </q-td>
             </q-tr>
           </template>
-          {% endraw %}
         </q-table>
       </q-card-section>
     </q-card>
@@ -66,7 +64,7 @@
     <q-card class="q-pa-lg q-pt-xl">
       <div class="text-center q-mb-lg">
         <qrcode-stream
-          @decode="decodeQR"
+          @detect="decodeQR"
           class="rounded-borders"
         ></qrcode-stream>
       </div>
@@ -80,96 +78,7 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-  Vue.use(VueQrcodeReader)
-  var mapEvents = function (obj) {
-    obj.date = Quasar.utils.date.formatDate(
-      new Date(obj.time * 1000),
-      'YYYY-MM-DD HH:mm'
-    )
-    obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.amount)
-    obj.displayUrl = ['/events/', obj.id].join('')
-    return obj
-  }
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        tickets: [],
-        ticketsTable: {
-          columns: [
-            {name: 'id', align: 'left', label: 'ID', field: 'id'},
-            {name: 'name', align: 'left', label: 'Name', field: 'name'},
-            {
-              name: 'registered',
-              align: 'left',
-              label: 'Registered',
-              field: 'registered'
-            }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        sendCamera: {
-          show: false,
-          camera: 'auto'
-        }
-      }
-    },
-    methods: {
-      hoverEmail: function (tmp) {
-        this.tickets.data.emailtemp = tmp
-      },
-      closeCamera: function () {
-        this.sendCamera.show = false
-      },
-      showCamera: function () {
-        this.sendCamera.show = true
-      },
-      decodeQR: function (res) {
-        this.sendCamera.show = false
-        var self = this
-
-        LNbits.api
-          .request(
-            'GET',
-            '/events/api/v1/register/ticket/' + res.split('//')[1]
-          )
-          .then(function (response) {
-            self.$q.notify({
-              type: 'positive',
-              message: 'Registered!'
-            })
-            setTimeout(function () {
-              window.location.reload()
-            }, 2000)
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      getEventTickets: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/events/api/v1/eventtickets/{{ wallet_id }}/{{ event_id }}'
-          )
-          .then(function (response) {
-            self.tickets = response.data.map(function (obj) {
-              return mapEvents(obj)
-            })
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      }
-    },
-    created: function () {
-      this.getEventTickets()
-    }
-  })
+  const event_id = '{{ event_id }}'
 </script>
+<script src="{{ static_url_for('events/static', path='js/register.js') }}"></script>
 {% endblock %}

templates/events/ticket.html

@@ -11,12 +11,10 @@
             and present it for registration!
           </h5>
           <br />
-          <q-responsive :ratio="1" class="q-mb-md" style="max-width: 300px">
-            <qrcode
-              :value="'ticket://{{ ticket_id }}'"
-              :options="{width: 500}"
-            ></qrcode>
-          </q-responsive>
+          <lnbits-qrcode
+            :value="'ticket://{{ ticket_id }}'"
+            :options="{width: 500}"
+          ></lnbits-qrcode>
           <br />
           <q-btn @click="printWindow" color="grey" class="q-ml-auto">
             <q-icon left size="3em" name="print"></q-icon> Print</q-btn
@@ -28,15 +26,11 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-  new Vue({
+  window.app = Vue.createApp({
     el: '#vue',
     mixins: [windowMixin],
-    data: function () {
-      return {}
-    },
     methods: {
-      printWindow: function () {
+      printWindow() {
         window.print()
       }
     }

tests/test_init.py

@@ -0,0 +1,11 @@
+import pytest
+from fastapi import APIRouter
+
+from .. import events_ext
+
+
+# just import router and add it to a test router
+@pytest.mark.asyncio
+async def test_router():
+    router = APIRouter()
+    router.include_router(events_ext)

toc.md

@@ -0,0 +1,29 @@
+# Terms and Conditions for LNbits Extension
+
+## 1. Acceptance of Terms
+
+By installing and using the LNbits extension ("Extension"), you agree to be bound by these terms and conditions ("Terms"). If you do not agree to these Terms, do not use the Extension.
+
+## 2. License
+
+The Extension is free and open-source software, released under [specify the FOSS license here, e.g., GPL-3.0, MIT, etc.]. You are permitted to use, copy, modify, and distribute the Extension under the terms of that license.
+
+## 3. No Warranty
+
+The Extension is provided "as is" and with all faults, and the developer expressly disclaims all warranties of any kind, whether express, implied, statutory, or otherwise, including but not limited to warranties of merchantability, fitness for a particular purpose, non-infringement, and any warranties arising out of course of dealing or usage of trade. No advice or information, whether oral or written, obtained from the developer or elsewhere will create any warranty not expressly stated in this Terms.
+
+## 4. Limitation of Liability
+
+In no event will the developer be liable to you or any third party for any direct, indirect, incidental, special, consequential, or punitive damages, including lost profit, lost revenue, loss of data, or other damages arising out of or in connection with your use of the Extension, even if the developer has been advised of the possibility of such damages. The foregoing limitation of liability shall apply to the fullest extent permitted by law in the applicable jurisdiction.
+
+## 5. Modification of Terms
+
+The developer reserves the right to modify these Terms at any time. You are advised to review these Terms periodically for any changes. Changes to these Terms are effective when they are posted on the appropriate location within or associated with the Extension.
+
+## 6. General Provisions
+
+If any provision of these Terms is held to be invalid or unenforceable, that provision will be enforced to the maximum extent permissible, and the other provisions of these Terms will remain in full force and effect. These Terms constitute the entire agreement between you and the developer regarding the use of the Extension.
+
+## 7. Contact Information
+
+If you have any questions about these Terms, please contact the developer at [developer's contact information].

views.py

@@ -1,28 +1,30 @@
 from datetime import date, datetime
 from http import HTTPStatus
 
-from fastapi import Depends, Request
-from fastapi.templating import Jinja2Templates
+from fastapi import APIRouter, Depends, Request
+from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
+from lnbits.helpers import template_renderer
 from starlette.exceptions import HTTPException
 from starlette.responses import HTMLResponse
 
-from lnbits.core.models import User
-from lnbits.decorators import check_user_exists
-
-from . import events_ext, events_renderer
 from .crud import get_event, get_ticket
 
-templates = Jinja2Templates(directory="templates")
+events_generic_router = APIRouter()
 
 
-@events_ext.get("/", response_class=HTMLResponse)
+def events_renderer():
+    return template_renderer(["events/templates"])
+
+
+@events_generic_router.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return events_renderer().TemplateResponse(
-        "events/index.html", {"request": request, "user": user.dict()}
+        "events/index.html", {"request": request, "user": user.json()}
     )
 
 
-@events_ext.get("/{event_id}", response_class=HTMLResponse)
+@events_generic_router.get("/{event_id}", response_class=HTMLResponse)
 async def display(request: Request, event_id):
     event = await get_event(event_id)
     if not event:
@@ -63,7 +65,7 @@ async def display(request: Request, event_id):
     )
 
 
-@events_ext.get("/ticket/{ticket_id}", response_class=HTMLResponse)
+@events_generic_router.get("/ticket/{ticket_id}", response_class=HTMLResponse)
 async def ticket(request: Request, ticket_id):
     ticket = await get_ticket(ticket_id)
     if not ticket:
@@ -88,7 +90,7 @@ async def ticket(request: Request, ticket_id):
     )
 
 
-@events_ext.get("/register/{event_id}", response_class=HTMLResponse)
+@events_generic_router.get("/register/{event_id}", response_class=HTMLResponse)
 async def register(request: Request, event_id):
     event = await get_event(event_id)
     if not event:

views_api.py

@@ -1,23 +1,21 @@
+from datetime import datetime, timezone
 from http import HTTPStatus
+from typing import Optional
 
-from fastapi import Depends, Query
-from starlette.exceptions import HTTPException
-
+from fastapi import APIRouter, Depends, Query
 from lnbits.core.crud import get_standalone_payment, get_user
+from lnbits.core.models import WalletTypeInfo
 from lnbits.core.services import create_invoice
 from lnbits.decorators import (
-    WalletTypeInfo,
-    get_key_type,
     require_admin_key,
     require_invoice_key,
 )
 from lnbits.utils.exchange_rates import (
-    currencies,
     fiat_amount_as_satoshis,
     get_fiat_rate_satoshis,
 )
+from starlette.exceptions import HTTPException
 
-from . import events_ext
 from .crud import (
     create_event,
     create_ticket,
@@ -29,19 +27,20 @@ from .crud import (
     get_events,
     get_ticket,
     get_tickets,
-    reg_ticket,
-    set_ticket_paid,
-    update_event,
     purge_unpaid_tickets,
+    update_event,
+    update_ticket,
 )
-from .models import CreateEvent, CreateTicket
+from .models import CreateEvent, CreateTicket, Ticket
+from .services import set_ticket_paid
 
-# Events
+events_api_router = APIRouter()
 
 
-@events_ext.get("/api/v1/events")
+@events_api_router.get("/api/v1/events")
 async def api_events(
-    all_wallets: bool = Query(False), wallet: WalletTypeInfo = Depends(get_key_type)
+    all_wallets: bool = Query(False),
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
 ):
     wallet_ids = [wallet.wallet.id]
 
@@ -52,12 +51,12 @@ async def api_events(
     return [event.dict() for event in await get_events(wallet_ids)]
 
 
-@events_ext.post("/api/v1/events")
-@events_ext.put("/api/v1/events/{event_id}")
+@events_api_router.post("/api/v1/events")
+@events_api_router.put("/api/v1/events/{event_id}")
 async def api_event_create(
     data: CreateEvent,
-    event_id=None,
     wallet: WalletTypeInfo = Depends(require_admin_key),
+    event_id: Optional[str] = None,
 ):
     if event_id:
         event = await get_event(event_id)
@@ -70,16 +69,18 @@ async def api_event_create(
             raise HTTPException(
                 status_code=HTTPStatus.FORBIDDEN, detail="Not your event."
             )
-        event = await update_event(event_id, **data.dict())
+        for k, v in data.dict().items():
+            setattr(event, k, v)
+        event = await update_event(event)
     else:
-        event = await create_event(data=data)
+        event = await create_event(data)
 
     return event.dict()
 
 
-@events_ext.delete("/api/v1/events/{event_id}")
+@events_api_router.delete("/api/v1/events/{event_id}")
 async def api_form_delete(
-    event_id, wallet: WalletTypeInfo = Depends(require_admin_key)
+    event_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
     event = await get_event(event_id)
     if not event:
@@ -98,27 +99,28 @@ async def api_form_delete(
 #########Tickets##########
 
 
-@events_ext.get("/api/v1/tickets")
+@events_api_router.get("/api/v1/tickets")
 async def api_tickets(
-    all_wallets: bool = Query(False), wallet: WalletTypeInfo = Depends(get_key_type)
-):
+    all_wallets: bool = Query(False),
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
+) -> list[Ticket]:
     wallet_ids = [wallet.wallet.id]
 
     if all_wallets:
         user = await get_user(wallet.wallet.user)
         wallet_ids = user.wallet_ids if user else []
 
-    return [ticket.dict() for ticket in await get_tickets(wallet_ids)]
+    return await get_tickets(wallet_ids)
 
 
-@events_ext.post("/api/v1/tickets/{event_id}")
+@events_api_router.post("/api/v1/tickets/{event_id}")
 async def api_ticket_create(event_id: str, data: CreateTicket):
     name = data.name
     email = data.email
     return await api_ticket_make_ticket(event_id, name, email)
 
 
-@events_ext.get("/api/v1/tickets/{event_id}/{name}/{email}")
+@events_api_router.get("/api/v1/tickets/{event_id}/{name}/{email}")
 async def api_ticket_make_ticket(event_id, name, email):
     event = await get_event(event_id)
     if not event:
@@ -129,7 +131,7 @@ async def api_ticket_make_ticket(event_id, name, email):
     price = event.price_per_ticket
     extra = {"tag": "events", "name": name, "email": email}
 
-    if event.currency != "sat":
+    if event.currency != "sats":
         price = await fiat_amount_as_satoshis(event.price_per_ticket, event.currency)
 
         extra["fiat"] = True
@@ -138,25 +140,27 @@ async def api_ticket_make_ticket(event_id, name, email):
         extra["rate"] = await get_fiat_rate_satoshis(event.currency)
 
     try:
-        payment_hash, payment_request = await create_invoice(
+        payment = await create_invoice(
             wallet_id=event.wallet,
-            amount=price,  # type: ignore
+            amount=price,
             memo=f"{event_id}",
             extra=extra,
         )
         await create_ticket(
-            payment_hash=payment_hash,
+            payment_hash=payment.payment_hash,
             wallet=event.wallet,
             event=event.id,
             name=name,
             email=email,
         )
-    except Exception as e:
-        raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
-    return {"payment_hash": payment_hash, "payment_request": payment_request}
+    except Exception as exc:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(exc)
+        ) from exc
+    return {"payment_hash": payment.payment_hash, "payment_request": payment.bolt11}
 
 
-@events_ext.post("/api/v1/tickets/{event_id}/{payment_hash}")
+@events_api_router.post("/api/v1/tickets/{event_id}/{payment_hash}")
 async def api_ticket_send_ticket(event_id, payment_hash):
     event = await get_event(event_id)
     if not event:
@@ -171,25 +175,28 @@ async def api_ticket_send_ticket(event_id, payment_hash):
             status_code=HTTPStatus.NOT_FOUND,
             detail="Ticket could not be fetched.",
         )
-    payment = await get_standalone_payment(payment_hash)
+    payment = await get_standalone_payment(payment_hash, incoming=True)
     assert payment
     price = (
         event.price_per_ticket * 1000
-        if event.currency == "sat"
+        if event.currency == "sats"
         else await fiat_amount_as_satoshis(event.price_per_ticket, event.currency)
         * 1000
     )
-    if (
-        not payment.pending and abs(price - payment.amount) < price * 0.01
-    ):  # allow 1% error
-        await set_ticket_paid(payment_hash)
+    # check if price is equal to payment.amount
+    lower_bound = price * 0.99  # 1% decrease
+
+    if not payment.pending and abs(payment.amount) >= lower_bound:  # allow 1% error
+        await set_ticket_paid(ticket)
         return {"paid": True, "ticket_id": ticket.id}
 
     return {"paid": False}
 
 
-@events_ext.delete("/api/v1/tickets/{ticket_id}")
-async def api_ticket_delete(ticket_id, wallet: WalletTypeInfo = Depends(get_key_type)):
+@events_api_router.delete("/api/v1/tickets/{ticket_id}")
+async def api_ticket_delete(
+    ticket_id: str, wallet: WalletTypeInfo = Depends(require_invoice_key)
+):
     ticket = await get_ticket(ticket_id)
     if not ticket:
         raise HTTPException(
@@ -200,11 +207,11 @@ async def api_ticket_delete(ticket_id, wallet: WalletTypeInfo = Depends(get_key_
         raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail="Not your ticket.")
 
     await delete_ticket(ticket_id)
-    return "", HTTPStatus.NO_CONTENT
 
 
-@events_ext.get("/api/v1/purge/{event_id}")
-async def api_event_purge_tickets(event_id):
+# TODO: DELETE, updates db! @tal
+@events_api_router.get("/api/v1/purge/{event_id}")
+async def api_event_purge_tickets(event_id: str):
     event = await get_event(event_id)
     if not event:
         raise HTTPException(
@@ -213,19 +220,14 @@ async def api_event_purge_tickets(event_id):
     return await purge_unpaid_tickets(event_id)
 
 
-# Event Tickets
+@events_api_router.get("/api/v1/eventtickets/{event_id}")
+async def api_event_tickets(event_id: str) -> list[Ticket]:
+    return await get_event_tickets(event_id)
 
 
-@events_ext.get("/api/v1/eventtickets/{wallet_id}/{event_id}")
-async def api_event_tickets(wallet_id, event_id):
-    return [
-        ticket.dict()
-        for ticket in await get_event_tickets(wallet_id=wallet_id, event_id=event_id)
-    ]
-
-
-@events_ext.get("/api/v1/register/ticket/{ticket_id}")
-async def api_event_register_ticket(ticket_id):
+# TODO: PUT, updates db! @tal
+@events_api_router.get("/api/v1/register/ticket/{ticket_id}")
+async def api_event_register_ticket(ticket_id) -> list[Ticket]:
     ticket = await get_ticket(ticket_id)
 
     if not ticket:
@@ -243,9 +245,7 @@ async def api_event_register_ticket(ticket_id):
             status_code=HTTPStatus.FORBIDDEN, detail="Ticket already registered"
         )
 
-    return [ticket.dict() for ticket in await reg_ticket(ticket_id)]
-
-
-@events_ext.get("/api/v1/currencies")
-async def api_list_currencies_available():
-    return list(currencies.keys())
+    ticket.registered = True
+    ticket.reg_timestamp = datetime.now(timezone.utc)
+    await update_ticket(ticket)
+    return await get_event_tickets(ticket.event)