Merge branch 'master' into TwitchAlerts

lnbits/__main__.py

@@ -1,4 +1,4 @@
-import trio  # type: ignore
+import trio
 
 from .commands import migrate_databases, transpile_scss, bundle_vendored
 

lnbits/app.py

@@ -7,7 +7,6 @@ from quart import g
 from quart_trio import QuartTrio
 from quart_cors import cors  # type: ignore
 from quart_compress import Compress  # type: ignore
-from secure import SecureHeaders  # type: ignore
 
 from .commands import db_migrate, handle_assets
 from .core import core_app
@@ -27,8 +26,6 @@ from .tasks import (
 )
 from .settings import WALLET
 
-secure_headers = SecureHeaders(hsts=False, xfo=False)
-
 
 def create_app(config_object="lnbits.settings") -> QuartTrio:
     """Create application factory.
@@ -46,7 +43,6 @@ def create_app(config_object="lnbits.settings") -> QuartTrio:
     register_blueprints(app)
     register_filters(app)
     register_commands(app)
-    register_request_hooks(app)
     register_async_tasks(app)
     register_exception_handlers(app)
 
@@ -108,19 +104,13 @@ def register_assets(app: QuartTrio):
 def register_filters(app: QuartTrio):
     """Jinja filters."""
     app.jinja_env.globals["SITE_TITLE"] = app.config["LNBITS_SITE_TITLE"]
+    app.jinja_env.globals["SITE_TAGLINE"] = app.config["LNBITS_SITE_TAGLINE"]
+    app.jinja_env.globals["SITE_DESCRIPTION"] = app.config["LNBITS_SITE_DESCRIPTION"]
+    app.jinja_env.globals["LNBITS_THEME_OPTIONS"] = app.config["LNBITS_THEME_OPTIONS"]
     app.jinja_env.globals["LNBITS_VERSION"] = app.config["LNBITS_COMMIT"]
     app.jinja_env.globals["EXTENSIONS"] = get_valid_extensions()
 
 
-def register_request_hooks(app: QuartTrio):
-    """Open the core db for each request so everything happens in a big transaction"""
-
-    @app.after_request
-    async def set_secure_headers(response):
-        secure_headers.quart(response)
-        return response
-
-
 def register_async_tasks(app):
     @app.route("/wallet/webhook", methods=["GET", "POST", "PUT", "PATCH", "DELETE"])
     async def webhook_listener():

lnbits/bolt11.py

@@ -161,9 +161,9 @@ def _trim_to_bytes(barr):
 
 def _readable_scid(short_channel_id: int) -> str:
     return "{blockheight}x{transactionindex}x{outputindex}".format(
-        blockheight=((short_channel_id >> 40) & 0xFFFFFF),
-        transactionindex=((short_channel_id >> 16) & 0xFFFFFF),
-        outputindex=(short_channel_id & 0xFFFF),
+        blockheight=((short_channel_id >> 40) & 0xffffff),
+        transactionindex=((short_channel_id >> 16) & 0xffffff),
+        outputindex=(short_channel_id & 0xffff),
     )
 
 

lnbits/commands.py

@@ -1,11 +1,11 @@
-import trio  # type: ignore
+import trio
 import warnings
 import click
 import importlib
 import re
 import os
-from sqlalchemy.exc import OperationalError  # type: ignore
 
+from .db import SQLITE, POSTGRES, COCKROACH
 from .core import db as core_db, migrations as core_migrations
 from .helpers import (
     get_valid_extensions,
@@ -53,41 +53,59 @@ def bundle_vendored():
 async def migrate_databases():
     """Creates the necessary databases if they don't exist already; or migrates them."""
 
-    async with core_db.connect() as conn:
-        try:
-            rows = await (await conn.execute("SELECT * FROM dbversions")).fetchall()
-        except OperationalError:
-            # migration 3 wasn't ran
-            await core_migrations.m000_create_migrations_table(conn)
-            rows = await (await conn.execute("SELECT * FROM dbversions")).fetchall()
+    async def set_migration_version(conn, db_name, version):
+        await conn.execute(
+            """
+            INSERT INTO dbversions (db, version) VALUES (?, ?)
+            ON CONFLICT (db) DO UPDATE SET version = ?
+            """,
+            (db_name, version, version),
+        )
 
+    async def run_migration(db, migrations_module):
+        db_name = migrations_module.__name__.split(".")[-2]
+        for key, migrate in migrations_module.__dict__.items():
+            match = match = matcher.match(key)
+            if match:
+                version = int(match.group(1))
+                if version > current_versions.get(db_name, 0):
+                    print(f"running migration {db_name}.{version}")
+                    await migrate(db)
+
+                    if db.schema == None:
+                        await set_migration_version(db, db_name, version)
+                    else:
+                        async with core_db.connect() as conn:
+                            await set_migration_version(conn, db_name, version)
+
+    async with core_db.connect() as conn:
+        if conn.type == SQLITE:
+            exists = await conn.fetchone(
+                "SELECT * FROM sqlite_master WHERE type='table' AND name='dbversions'"
+            )
+        elif conn.type in {POSTGRES, COCKROACH}:
+            exists = await conn.fetchone(
+                "SELECT * FROM information_schema.tables WHERE table_name = 'dbversions'"
+            )
+
+        if not exists:
+            await core_migrations.m000_create_migrations_table(conn)
+
+        rows = await (await conn.execute("SELECT * FROM dbversions")).fetchall()
         current_versions = {row["db"]: row["version"] for row in rows}
         matcher = re.compile(r"^m(\d\d\d)_")
-
-        async def run_migration(db, migrations_module):
-            db_name = migrations_module.__name__.split(".")[-2]
-            for key, migrate in migrations_module.__dict__.items():
-                match = match = matcher.match(key)
-                if match:
-                    version = int(match.group(1))
-                    if version > current_versions.get(db_name, 0):
-                        print(f"running migration {db_name}.{version}")
-                        await migrate(db)
-                        await conn.execute(
-                            "INSERT OR REPLACE INTO dbversions (db, version) VALUES (?, ?)",
-                            (db_name, version),
-                        )
-
         await run_migration(conn, core_migrations)
 
-        for ext in get_valid_extensions():
-            try:
-                ext_migrations = importlib.import_module(
-                    f"lnbits.extensions.{ext.code}.migrations"
-                )
-                ext_db = importlib.import_module(f"lnbits.extensions.{ext.code}").db
-                await run_migration(ext_db, ext_migrations)
-            except ImportError:
-                raise ImportError(
-                    f"Please make sure that the extension `{ext.code}` has a migrations file."
-                )
+    for ext in get_valid_extensions():
+        try:
+            ext_migrations = importlib.import_module(
+                f"lnbits.extensions.{ext.code}.migrations"
+            )
+            ext_db = importlib.import_module(f"lnbits.extensions.{ext.code}").db
+        except ImportError:
+            raise ImportError(
+                f"Please make sure that the extension `{ext.code}` has a migrations file."
+            )
+
+        async with ext_db.connect() as ext_conn:
+            await run_migration(ext_conn, ext_migrations)

lnbits/core/crud.py

@@ -5,7 +5,7 @@ from typing import List, Optional, Dict, Any
 from urllib.parse import urlparse
 
 from lnbits import bolt11
-from lnbits.db import Connection
+from lnbits.db import Connection, POSTGRES, COCKROACH
 from lnbits.settings import DEFAULT_WALLET_NAME
 
 from . import db
@@ -43,13 +43,14 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
 
     if user:
         extensions = await (conn or db).fetchall(
-            "SELECT extension FROM extensions WHERE user = ? AND active = 1", (user_id,)
+            """SELECT extension FROM extensions WHERE "user" = ? AND active""",
+            (user_id,),
         )
         wallets = await (conn or db).fetchall(
             """
             SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0) AS balance_msat
             FROM wallets
-            WHERE user = ?
+            WHERE "user" = ?
             """,
             (user_id,),
         )
@@ -70,14 +71,14 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
 
 
 async def update_user_extension(
-    *, user_id: str, extension: str, active: int, conn: Optional[Connection] = None
+    *, user_id: str, extension: str, active: bool, conn: Optional[Connection] = None
 ) -> None:
     await (conn or db).execute(
         """
-        INSERT OR REPLACE INTO extensions (user, extension, active)
-        VALUES (?, ?, ?)
+        INSERT INTO extensions ("user", extension, active) VALUES (?, ?, ?)
+        ON CONFLICT ("user", extension) DO UPDATE SET active = ?
         """,
-        (user_id, extension, active),
+        (user_id, extension, active, active),
     )
 
 
@@ -94,7 +95,7 @@ async def create_wallet(
     wallet_id = uuid4().hex
     await (conn or db).execute(
         """
-        INSERT INTO wallets (id, name, user, adminkey, inkey)
+        INSERT INTO wallets (id, name, "user", adminkey, inkey)
         VALUES (?, ?, ?, ?, ?)
         """,
         (
@@ -119,10 +120,10 @@ async def delete_wallet(
         """
         UPDATE wallets AS w
         SET
-            user = 'del:' || w.user,
+            "user" = 'del:' || w."user",
             adminkey = 'del:' || w.adminkey,
             inkey = 'del:' || w.inkey
-        WHERE id = ? AND user = ?
+        WHERE id = ? AND "user" = ?
         """,
         (wallet_id, user_id),
     )
@@ -218,7 +219,12 @@ async def get_payments(
     clause: List[str] = []
 
     if since != None:
-        clause.append("time > ?")
+        if db.type == POSTGRES:
+            clause.append("time > to_timestamp(?)")
+        elif db.type == COCKROACH:
+            clause.append("time > cast(? AS timestamp)")
+        else:
+            clause.append("time > ?")
         args.append(since)
 
     if wallet_id:
@@ -228,9 +234,9 @@ async def get_payments(
     if complete and pending:
         pass
     elif complete:
-        clause.append("((amount > 0 AND pending = 0) OR amount < 0)")
+        clause.append("((amount > 0 AND pending = false) OR amount < 0)")
     elif pending:
-        clause.append("pending = 1")
+        clause.append("pending = true")
     else:
         pass
 
@@ -269,20 +275,21 @@ async def delete_expired_invoices(
 ) -> None:
     # first we delete all invoices older than one month
     await (conn or db).execute(
-        """
+        f"""
         DELETE FROM apipayments
-        WHERE pending = 1 AND amount > 0 AND time < strftime('%s', 'now') - 2592000
+        WHERE pending = true AND amount > 0
+          AND time < {db.timestamp_now} - {db.interval_seconds(2592000)}
         """
     )
 
     # then we delete all expired invoices, checking one by one
     rows = await (conn or db).fetchall(
-        """
+        f"""
         SELECT bolt11
         FROM apipayments
-        WHERE pending = 1
+        WHERE pending = true
           AND bolt11 IS NOT NULL
-          AND amount > 0 AND time < strftime('%s', 'now') - 86400
+          AND amount > 0 AND time < {db.timestamp_now} - {db.interval_seconds(86400)}
         """
     )
     for (payment_request,) in rows:
@@ -298,7 +305,7 @@ async def delete_expired_invoices(
         await (conn or db).execute(
             """
             DELETE FROM apipayments
-            WHERE pending = 1 AND hash = ?
+            WHERE pending = true AND hash = ?
             """,
             (invoice.payment_hash,),
         )
@@ -337,7 +344,7 @@ async def create_payment(
             payment_hash,
             preimage,
             amount,
-            int(pending),
+            pending,
             memo,
             fee,
             json.dumps(extra)
@@ -361,7 +368,7 @@ async def update_payment_status(
     await (conn or db).execute(
         "UPDATE apipayments SET pending = ? WHERE checking_id = ?",
         (
-            int(pending),
+            pending,
             checking_id,
         ),
     )
@@ -406,10 +413,10 @@ async def save_balance_check(
 
     await (conn or db).execute(
         """
-        INSERT OR REPLACE INTO balance_check (wallet, service, url)
-        VALUES (?, ?, ?)
+        INSERT INTO balance_check (wallet, service, url) VALUES (?, ?, ?)
+        ON CONFLICT (wallet, service) DO UPDATE SET url = ?
         """,
-        (wallet_id, domain, url),
+        (wallet_id, domain, url, url),
     )
 
 
@@ -445,10 +452,10 @@ async def save_balance_notify(
 ):
     await (conn or db).execute(
         """
-        INSERT OR REPLACE INTO balance_notify (wallet, url)
-        VALUES (?, ?)
+        INSERT INTO balance_notify (wallet, url) VALUES (?, ?)
+        ON CONFLICT (wallet) DO UPDATE SET url = ?
         """,
-        (wallet_id, url),
+        (wallet_id, url, url),
     )
 
 

lnbits/core/migrations.py

@@ -18,7 +18,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS accounts (
+        CREATE TABLE accounts (
             id TEXT PRIMARY KEY,
             email TEXT,
             pass TEXT
@@ -27,37 +27,36 @@ async def m001_initial(db):
     )
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS extensions (
-            user TEXT NOT NULL,
+        CREATE TABLE extensions (
+            "user" TEXT NOT NULL,
             extension TEXT NOT NULL,
-            active BOOLEAN DEFAULT 0,
+            active BOOLEAN DEFAULT false,
 
-            UNIQUE (user, extension)
+            UNIQUE ("user", extension)
         );
     """
     )
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS wallets (
+        CREATE TABLE wallets (
             id TEXT PRIMARY KEY,
             name TEXT NOT NULL,
-            user TEXT NOT NULL,
+            "user" TEXT NOT NULL,
             adminkey TEXT NOT NULL,
             inkey TEXT
         );
     """
     )
     await db.execute(
-        """
-        CREATE TABLE IF NOT EXISTS apipayments (
+        f"""
+        CREATE TABLE apipayments (
             payhash TEXT NOT NULL,
             amount INTEGER NOT NULL,
             fee INTEGER NOT NULL DEFAULT 0,
             wallet TEXT NOT NULL,
             pending BOOLEAN NOT NULL,
             memo TEXT,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now')),
-
+            time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now},
             UNIQUE (wallet, payhash)
         );
     """
@@ -65,18 +64,18 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE VIEW IF NOT EXISTS balances AS
+        CREATE VIEW balances AS
         SELECT wallet, COALESCE(SUM(s), 0) AS balance FROM (
             SELECT wallet, SUM(amount) AS s  -- incoming
             FROM apipayments
-            WHERE amount > 0 AND pending = 0  -- don't sum pending
+            WHERE amount > 0 AND pending = false  -- don't sum pending
             GROUP BY wallet
             UNION ALL
             SELECT wallet, SUM(amount + fee) AS s  -- outgoing, sum fees
             FROM apipayments
             WHERE amount < 0  -- do sum pending
             GROUP BY wallet
-        )
+        )x
         GROUP BY wallet;
     """
     )
@@ -143,21 +142,20 @@ async def m004_ensure_fees_are_always_negative(db):
     """
 
     await db.execute("DROP VIEW balances")
-
     await db.execute(
         """
-        CREATE VIEW IF NOT EXISTS balances AS
+        CREATE VIEW balances AS
         SELECT wallet, COALESCE(SUM(s), 0) AS balance FROM (
             SELECT wallet, SUM(amount) AS s  -- incoming
             FROM apipayments
-            WHERE amount > 0 AND pending = 0  -- don't sum pending
+            WHERE amount > 0 AND pending = false  -- don't sum pending
             GROUP BY wallet
             UNION ALL
             SELECT wallet, SUM(amount - abs(fee)) AS s  -- outgoing, sum fees
             FROM apipayments
             WHERE amount < 0  -- do sum pending
             GROUP BY wallet
-        )
+        )x
         GROUP BY wallet;
     """
     )
@@ -171,7 +169,7 @@ async def m005_balance_check_balance_notify(db):
     await db.execute(
         """
         CREATE TABLE balance_check (
-          wallet INTEGER NOT NULL REFERENCES wallets (id),
+          wallet TEXT NOT NULL REFERENCES wallets (id),
           service TEXT NOT NULL,
           url TEXT NOT NULL,
 
@@ -183,7 +181,7 @@ async def m005_balance_check_balance_notify(db):
     await db.execute(
         """
         CREATE TABLE balance_notify (
-          wallet INTEGER NOT NULL REFERENCES wallets (id),
+          wallet TEXT NOT NULL REFERENCES wallets (id),
           url TEXT NOT NULL,
 
           UNIQUE(wallet, url)

lnbits/core/services.py

@@ -1,4 +1,4 @@
-import trio  # type: ignore
+import trio
 import json
 import httpx
 from io import BytesIO

lnbits/core/static/js/wallet.js

@@ -202,9 +202,7 @@ new Vue({
       return this.parse.invoice.sat <= this.balance
     },
     pendingPaymentsExist: function () {
-      return this.payments
-        ? _.where(this.payments, {pending: 1}).length > 0
-        : false
+      return this.payments.findIndex(payment => payment.pending) !== -1
     }
   },
   filters: {

lnbits/core/tasks.py

@@ -1,4 +1,4 @@
-import trio  # type: ignore
+import trio
 import httpx
 from typing import List
 

lnbits/core/templates/core/extensions.html

@@ -17,14 +17,14 @@
         ></q-icon>
         {% raw %}
         <h5 class="q-mt-lg q-mb-xs">{{ extension.name }}</h5>
-        {{ extension.shortDescription }} {% endraw %}
+        <small>{{ extension.shortDescription }} </small>{% endraw %}
       </q-card-section>
       <q-separator></q-separator>
       <q-card-actions>
         <div v-if="extension.isEnabled">
           <q-btn
             flat
-            color="deep-purple"
+            color="primary"
             type="a"
             :href="[extension.url, '?usr=', g.user.id].join('')"
             >Open</q-btn
@@ -41,7 +41,7 @@
         <q-btn
           v-else
           flat
-          color="deep-purple"
+          color="primary"
           type="a"
           :href="['{{ url_for('core.extensions') }}', '?usr=', g.user.id, '&enable=', extension.code].join('')"
         >

lnbits/core/templates/core/index.html

@@ -8,7 +8,7 @@
         {% if lnurl %}
         <q-btn
           unelevated
-          color="deep-purple"
+          color="primary"
           @click="processing"
           type="a"
           href="{{ url_for('core.lnurlwallet', lightning=lnurl) }}"
@@ -25,7 +25,7 @@
           ></q-input>
           <q-btn
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="walletName == ''"
             type="submit"
             >Add a new wallet</q-btn
@@ -37,58 +37,66 @@
 
     <q-card>
       <q-card-section>
-        <h3 class="q-my-none"><strong>LN</strong>bits</h3>
-        <h5 class="q-my-md">Free and open-source lightning wallet</h5>
-        <p>
-          Easy to set up and lightweight, LNbits can run on any
-          lightning-network funding source, currently supporting LND,
-          c-lightning, OpenNode, lntxbot, LNPay and even LNbits itself!
-        </p>
-        <p>
-          You can run LNbits for yourself, or easily offer a custodian solution
-          for others.
-        </p>
-        <p>
-          Each wallet has its own API keys and there is no limit to the number
-          of wallets you can make. Being able to partition funds makes LNbits a
-          useful tool for money management and as a development tool.
-        </p>
-        <p>
-          Extensions add extra functionality to LNbits so you can experiment
-          with a range of cutting-edge technologies on the lightning network. We
-          have made developing extensions as easy as possible, and as a free and
-          open-source project, we encourage people to develop and submit their
-          own.
-        </p>
-        <div class="row q-mt-md q-gutter-sm">
-          <q-btn
-            outline
-            color="grey"
-            type="a"
-            href="https://github.com/lnbits/lnbits"
-            target="_blank"
-            rel="noopener"
-            >View project in GitHub</q-btn
-          >
-          <q-btn
-            outline
-            color="grey"
-            type="a"
-            href="https://lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
-            target="_blank"
-            rel="noopener"
-            >Donate</q-btn
-          >
+        <h3 class="q-my-none">{{SITE_TITLE}}</h3>
+        <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
+        <div v-if="'{{SITE_TITLE}}' == 'LNbits'">
+          <p>
+            Easy to set up and lightweight, LNbits can run on any
+            lightning-network funding source, currently supporting LND,
+            c-lightning, OpenNode, lntxbot, LNPay and even LNbits itself!
+          </p>
+          <p>
+            You can run LNbits for yourself, or easily offer a custodian
+            solution for others.
+          </p>
+          <p>
+            Each wallet has its own API keys and there is no limit to the number
+            of wallets you can make. Being able to partition funds makes LNbits
+            a useful tool for money management and as a development tool.
+          </p>
+          <p>
+            Extensions add extra functionality to LNbits so you can experiment
+            with a range of cutting-edge technologies on the lightning network.
+            We have made developing extensions as easy as possible, and as a
+            free and open-source project, we encourage people to develop and
+            submit their own.
+          </p>
+          <div class="row q-mt-md q-gutter-sm">
+            <q-btn
+              outline
+              color="grey"
+              type="a"
+              href="https://github.com/lnbits/lnbits"
+              target="_blank"
+              rel="noopener"
+              >View project in GitHub</q-btn
+            >
+            <q-btn
+              outline
+              color="grey"
+              type="a"
+              href="https://lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
+              target="_blank"
+              rel="noopener"
+              >Donate</q-btn
+            >
+          </div>
         </div>
+        <p v-else>{{SITE_DESCRIPTION}}</p>
       </q-card-section>
     </q-card>
   </div>
 
   <!-- Ads -->
-  <div class="col-12 col-md-3 col-lg-3">
+  <div class="col-12 col-md-3 col-lg-3" v-if="'{{SITE_TITLE}}' == 'LNbits'">
     <div class="row q-col-gutter-lg justify-center">
       <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
-        <q-btn flat color="purple" label="Runs on" class="full-width"></q-btn>
+        <q-btn
+          flat
+          color="secondary"
+          label="Runs on"
+          class="full-width"
+        ></q-btn>
         <div class="row">
           <div class="col">
             <a href="https://github.com/ElementsProject/lightning">

lnbits/core/templates/core/wallet.html

@@ -22,7 +22,7 @@
         <div class="col">
           <q-btn
             unelevated
-            color="deep-purple"
+            color="primary"
             class="full-width"
             @click="showParseDialog"
             >Paste Request</q-btn
@@ -31,7 +31,7 @@
         <div class="col">
           <q-btn
             unelevated
-            color="deep-purple"
+            color="primary"
             class="full-width"
             @click="showReceiveDialog"
             >Create Invoice</q-btn
@@ -40,7 +40,7 @@
         <div class="col">
           <q-btn
             unelevated
-            color="purple"
+            color="secondary"
             icon="photo_camera"
             @click="showCamera"
             >scan
@@ -222,7 +222,7 @@
     <q-card>
       <q-card-section>
         <h6 class="text-subtitle1 q-mt-none q-mb-sm">
-          LNbits wallet: <strong><em>{{ wallet.name }}</em></strong>
+          {{ SITE_TITLE }} wallet: <strong><em>{{ wallet.name }}</em></strong>
         </h6>
       </q-card-section>
       <q-card-section class="q-pa-none">
@@ -342,7 +342,7 @@
       <div v-if="receive.status == 'pending'" class="row q-mt-lg">
         <q-btn
           unelevated
-          color="deep-purple"
+          color="primary"
           :disable="receive.data.memo == null || receive.data.amount == null || receive.data.amount <= 0"
           type="submit"
         >
@@ -355,7 +355,7 @@
       </div>
       <q-spinner
         v-if="receive.status == 'loading'"
-        color="deep-purple"
+        color="primary"
         size="2.55em"
       ></q-spinner>
     </q-form>
@@ -395,7 +395,7 @@
       </p>
       {% endraw %}
       <div v-if="canPay" class="row q-mt-lg">
-        <q-btn unelevated color="deep-purple" @click="payInvoice">Pay</q-btn>
+        <q-btn unelevated color="primary" @click="payInvoice">Pay</q-btn>
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
       </div>
       <div v-else class="row q-mt-lg">
@@ -423,7 +423,7 @@
           <code class="text-wrap"> {{ parse.lnurlauth.pubkey }} </code>
         </p>
         <div class="row q-mt-lg">
-          <q-btn unelevated color="deep-purple" type="submit">Login</q-btn>
+          <q-btn unelevated color="primary" type="submit">Login</q-btn>
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
@@ -485,9 +485,7 @@
           </div>
         </div>
         <div class="row q-mt-lg">
-          <q-btn unelevated color="deep-purple" type="submit"
-            >Send satoshis</q-btn
-          >
+          <q-btn unelevated color="primary" type="submit">Send satoshis</q-btn>
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
@@ -512,7 +510,7 @@
         <div class="row q-mt-lg">
           <q-btn
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="parse.data.request == ''"
             type="submit"
             >Read</q-btn

lnbits/core/views/api.py

@@ -1,4 +1,4 @@
-import trio  # type: ignore
+import trio
 import json
 import lnurl  # type: ignore
 import httpx

lnbits/core/views/generic.py

@@ -56,11 +56,11 @@ async def extensions():
 
     if extension_to_enable:
         await update_user_extension(
-            user_id=g.user.id, extension=extension_to_enable, active=1
+            user_id=g.user.id, extension=extension_to_enable, active=True
         )
     elif extension_to_disable:
         await update_user_extension(
-            user_id=g.user.id, extension=extension_to_disable, active=0
+            user_id=g.user.id, extension=extension_to_disable, active=False
         )
 
     return await render_template("core/extensions.html", user=await get_user(g.user.id))

lnbits/core/views/public_api.py

@@ -1,4 +1,4 @@
-import trio  # type: ignore
+import trio
 import datetime
 from http import HTTPStatus
 from quart import jsonify
@@ -32,6 +32,24 @@ async def api_public_payment_longpolling(payment_hash):
     print("adding standalone invoice listener", payment_hash, send_payment)
     api_invoice_listeners.append(send_payment)
 
-    async for payment in receive_payment:
-        if payment.payment_hash == payment_hash:
-            return jsonify({"status": "paid"}), HTTPStatus.OK
+    response = None
+
+    async def payment_info_receiver(cancel_scope):
+        async for payment in receive_payment:
+            if payment.payment_hash == payment_hash:
+                nonlocal response
+                response = (jsonify({"status": "paid"}), HTTPStatus.OK)
+                cancel_scope.cancel()
+
+    async def timeouter(cancel_scope):
+        await trio.sleep(45)
+        cancel_scope.cancel()
+
+    async with trio.open_nursery() as nursery:
+        nursery.start_soon(payment_info_receiver, nursery.cancel_scope)
+        nursery.start_soon(timeouter, nursery.cancel_scope)
+
+    if response:
+        return response
+    else:
+        return jsonify({"message": "timeout"}), HTTPStatus.REQUEST_TIMEOUT

lnbits/data/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

lnbits/db.py

@@ -1,36 +1,125 @@
 import os
 import trio
+import time
+from typing import Optional
 from contextlib import asynccontextmanager
 from sqlalchemy import create_engine  # type: ignore
 from sqlalchemy_aio import TRIO_STRATEGY  # type: ignore
-from sqlalchemy_aio.base import AsyncConnection
+from sqlalchemy_aio.base import AsyncConnection  # type: ignore
 
-from .settings import LNBITS_DATA_FOLDER
+from .settings import LNBITS_DATA_FOLDER, LNBITS_DATABASE_URL
+
+POSTGRES = "POSTGRES"
+COCKROACH = "COCKROACH"
+SQLITE = "SQLITE"
 
 
-class Connection:
-    def __init__(self, conn: AsyncConnection):
+class Compat:
+    type: Optional[str] = "<inherited>"
+    schema: Optional[str] = "<inherited>"
+
+    def interval_seconds(self, seconds: int) -> str:
+        if self.type in {POSTGRES, COCKROACH}:
+            return f"interval '{seconds} seconds'"
+        elif self.type == SQLITE:
+            return f"{seconds}"
+        return "<nothing>"
+
+    @property
+    def timestamp_now(self) -> str:
+        if self.type in {POSTGRES, COCKROACH}:
+            return "now()"
+        elif self.type == SQLITE:
+            return "(strftime('%s', 'now'))"
+        return "<nothing>"
+
+    @property
+    def serial_primary_key(self) -> str:
+        if self.type in {POSTGRES, COCKROACH}:
+            return "SERIAL PRIMARY KEY"
+        elif self.type == SQLITE:
+            return "INTEGER PRIMARY KEY AUTOINCREMENT"
+        return "<nothing>"
+
+    @property
+    def references_schema(self) -> str:
+        if self.type in {POSTGRES, COCKROACH}:
+            return f"{self.schema}."
+        elif self.type == SQLITE:
+            return ""
+        return "<nothing>"
+
+
+class Connection(Compat):
+    def __init__(self, conn: AsyncConnection, txn, typ, name, schema):
         self.conn = conn
+        self.txn = txn
+        self.type = typ
+        self.name = name
+        self.schema = schema
+
+    def rewrite_query(self, query) -> str:
+        if self.type in {POSTGRES, COCKROACH}:
+            query = query.replace("%", "%%")
+            query = query.replace("?", "%s")
+        return query
 
     async def fetchall(self, query: str, values: tuple = ()) -> list:
-        result = await self.conn.execute(query, values)
+        result = await self.conn.execute(self.rewrite_query(query), values)
         return await result.fetchall()
 
     async def fetchone(self, query: str, values: tuple = ()):
-        result = await self.conn.execute(query, values)
+        result = await self.conn.execute(self.rewrite_query(query), values)
         row = await result.fetchone()
         await result.close()
         return row
 
     async def execute(self, query: str, values: tuple = ()):
-        return await self.conn.execute(query, values)
+        return await self.conn.execute(self.rewrite_query(query), values)
 
 
-class Database:
+class Database(Compat):
     def __init__(self, db_name: str):
-        self.db_name = db_name
-        db_path = os.path.join(LNBITS_DATA_FOLDER, f"{db_name}.sqlite3")
-        self.engine = create_engine(f"sqlite:///{db_path}", strategy=TRIO_STRATEGY)
+        self.name = db_name
+
+        if LNBITS_DATABASE_URL:
+            database_uri = LNBITS_DATABASE_URL
+
+            if database_uri.startswith("cockroachdb://"):
+                self.type = COCKROACH
+            else:
+                self.type = POSTGRES
+
+            import psycopg2  # type: ignore
+
+            psycopg2.extensions.register_type(
+                psycopg2.extensions.new_type(
+                    psycopg2.extensions.DECIMAL.values,
+                    "DEC2FLOAT",
+                    lambda value, curs: float(value) if value is not None else None,
+                )
+            )
+            psycopg2.extensions.register_type(
+                psycopg2.extensions.new_type(
+                    psycopg2.extensions.TIME.values + psycopg2.extensions.DATE.values,
+                    "DATE2INT",
+                    lambda value, curs: time.mktime(value.timetuple())
+                    if value is not None
+                    else None,
+                )
+            )
+        else:
+            self.path = os.path.join(LNBITS_DATA_FOLDER, f"{self.name}.sqlite3")
+            database_uri = f"sqlite:///{self.path}"
+            self.type = SQLITE
+
+        self.schema = self.name
+        if self.name.startswith("ext_"):
+            self.schema = self.name[4:]
+        else:
+            self.schema = None
+
+        self.engine = create_engine(database_uri, strategy=TRIO_STRATEGY)
         self.lock = trio.StrictFIFOLock()
 
     @asynccontextmanager
@@ -38,8 +127,20 @@ class Database:
         await self.lock.acquire()
         try:
             async with self.engine.connect() as conn:
-                async with conn.begin():
-                    yield Connection(conn)
+                async with conn.begin() as txn:
+                    wconn = Connection(conn, txn, self.type, self.name, self.schema)
+
+                    if self.schema:
+                        if self.type in {POSTGRES, COCKROACH}:
+                            await wconn.execute(
+                                f"CREATE SCHEMA IF NOT EXISTS {self.schema}"
+                            )
+                        elif self.type == SQLITE:
+                            await wconn.execute(
+                                f"ATTACH '{self.path}' AS {self.schema}"
+                            )
+
+                    yield wconn
         finally:
             self.lock.release()
 

lnbits/extensions/amilk/crud.py

@@ -10,7 +10,7 @@ async def create_amilk(*, wallet_id: str, lnurl: str, atime: int, amount: int) -
     amilk_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
     await db.execute(
         """
-        INSERT INTO amilks (id, wallet, lnurl, atime, amount)
+        INSERT INTO amilk.amilks (id, wallet, lnurl, atime, amount)
         VALUES (?, ?, ?, ?, ?)
         """,
         (amilk_id, wallet_id, lnurl, atime, amount),
@@ -22,7 +22,7 @@ async def create_amilk(*, wallet_id: str, lnurl: str, atime: int, amount: int) -
 
 
 async def get_amilk(amilk_id: str) -> Optional[AMilk]:
-    row = await db.fetchone("SELECT * FROM amilks WHERE id = ?", (amilk_id,))
+    row = await db.fetchone("SELECT * FROM amilk.amilks WHERE id = ?", (amilk_id,))
     return AMilk(**row) if row else None
 
 
@@ -32,11 +32,11 @@ async def get_amilks(wallet_ids: Union[str, List[str]]) -> List[AMilk]:
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM amilks WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM amilk.amilks WHERE wallet IN ({q})", (*wallet_ids,)
     )
 
     return [AMilk(**row) for row in rows]
 
 
 async def delete_amilk(amilk_id: str) -> None:
-    await db.execute("DELETE FROM amilks WHERE id = ?", (amilk_id,))
+    await db.execute("DELETE FROM amilk.amilks WHERE id = ?", (amilk_id,))

lnbits/extensions/amilk/migrations.py

@@ -4,7 +4,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS amilks (
+        CREATE TABLE amilk.amilks (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             lnurl TEXT NOT NULL,

lnbits/extensions/amilk/templates/amilk/index.html

@@ -4,7 +4,7 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="amilkDialog.show = true"
+        <q-btn unelevated color="primary" @click="amilkDialog.show = true"
           >New AMilk</q-btn
         >
       </q-card-section>
@@ -109,7 +109,7 @@
         ></q-input>
         <q-btn
           unelevated
-          color="deep-purple"
+          color="primary"
           :disable="amilkDialog.data.amount == null || amilkDialog.data.amount < 0 || amilkDialog.data.lnurl == null"
           type="submit"
           >Create amilk</q-btn

lnbits/extensions/bleskomat/crud.py

@@ -21,7 +21,7 @@ async def create_bleskomat(
     api_key_encoding = "hex"
     await db.execute(
         """
-        INSERT INTO bleskomats (id, wallet, api_key_id, api_key_secret, api_key_encoding, name, fiat_currency, exchange_rate_provider, fee)
+        INSERT INTO bleskomat.bleskomats (id, wallet, api_key_id, api_key_secret, api_key_encoding, name, fiat_currency, exchange_rate_provider, fee)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -42,13 +42,15 @@ async def create_bleskomat(
 
 
 async def get_bleskomat(bleskomat_id: str) -> Optional[Bleskomat]:
-    row = await db.fetchone("SELECT * FROM bleskomats WHERE id = ?", (bleskomat_id,))
+    row = await db.fetchone(
+        "SELECT * FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,)
+    )
     return Bleskomat(**row) if row else None
 
 
 async def get_bleskomat_by_api_key_id(api_key_id: str) -> Optional[Bleskomat]:
     row = await db.fetchone(
-        "SELECT * FROM bleskomats WHERE api_key_id = ?", (api_key_id,)
+        "SELECT * FROM bleskomat.bleskomats WHERE api_key_id = ?", (api_key_id,)
     )
     return Bleskomat(**row) if row else None
 
@@ -58,7 +60,7 @@ async def get_bleskomats(wallet_ids: Union[str, List[str]]) -> List[Bleskomat]:
         wallet_ids = [wallet_ids]
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM bleskomats WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM bleskomat.bleskomats WHERE wallet IN ({q})", (*wallet_ids,)
     )
     return [Bleskomat(**row) for row in rows]
 
@@ -66,14 +68,17 @@ async def get_bleskomats(wallet_ids: Union[str, List[str]]) -> List[Bleskomat]:
 async def update_bleskomat(bleskomat_id: str, **kwargs) -> Optional[Bleskomat]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE bleskomats SET {q} WHERE id = ?", (*kwargs.values(), bleskomat_id)
+        f"UPDATE bleskomat.bleskomats SET {q} WHERE id = ?",
+        (*kwargs.values(), bleskomat_id),
+    )
+    row = await db.fetchone(
+        "SELECT * FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,)
     )
-    row = await db.fetchone("SELECT * FROM bleskomats WHERE id = ?", (bleskomat_id,))
     return Bleskomat(**row) if row else None
 
 
 async def delete_bleskomat(bleskomat_id: str) -> None:
-    await db.execute("DELETE FROM bleskomats WHERE id = ?", (bleskomat_id,))
+    await db.execute("DELETE FROM bleskomat.bleskomats WHERE id = ?", (bleskomat_id,))
 
 
 async def create_bleskomat_lnurl(
@@ -84,7 +89,7 @@ async def create_bleskomat_lnurl(
     now = int(time.time())
     await db.execute(
         """
-        INSERT INTO bleskomat_lnurls (id, bleskomat, wallet, hash, tag, params, api_key_id, initial_uses, remaining_uses, created_time, updated_time)
+        INSERT INTO bleskomat.bleskomat_lnurls (id, bleskomat, wallet, hash, tag, params, api_key_id, initial_uses, remaining_uses, created_time, updated_time)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -108,5 +113,7 @@ async def create_bleskomat_lnurl(
 
 async def get_bleskomat_lnurl(secret: str) -> Optional[BleskomatLnurl]:
     hash = generate_bleskomat_lnurl_hash(secret)
-    row = await db.fetchone("SELECT * FROM bleskomat_lnurls WHERE hash = ?", (hash,))
+    row = await db.fetchone(
+        "SELECT * FROM bleskomat.bleskomat_lnurls WHERE hash = ?", (hash,)
+    )
     return BleskomatLnurl(**row) if row else None

lnbits/extensions/bleskomat/migrations.py

@@ -2,7 +2,7 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS bleskomats (
+        CREATE TABLE bleskomat.bleskomats (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             api_key_id TEXT NOT NULL,
@@ -19,7 +19,7 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS bleskomat_lnurls (
+        CREATE TABLE bleskomat.bleskomat_lnurls (
             id TEXT PRIMARY KEY,
             bleskomat TEXT NOT NULL,
             wallet TEXT NOT NULL,

lnbits/extensions/bleskomat/models.py

@@ -100,7 +100,7 @@ class BleskomatLnurl(NamedTuple):
         now = int(time.time())
         result = await conn.execute(
             """
-            UPDATE bleskomat_lnurls
+            UPDATE bleskomat.bleskomat_lnurls
             SET remaining_uses = remaining_uses - 1, updated_time = ?
             WHERE id = ?
                 AND remaining_uses > 0

lnbits/extensions/bleskomat/templates/bleskomat/index.html

@@ -11,7 +11,7 @@
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="formDialog.show = true"
+        <q-btn unelevated color="primary" @click="formDialog.show = true"
           >Add Bleskomat</q-btn
         >
       </q-card-section>
@@ -150,14 +150,14 @@
           <q-btn
             v-if="formDialog.data.id"
             unelevated
-            color="deep-purple"
+            color="primary"
             type="submit"
             >Update Bleskomat</q-btn
           >
           <q-btn
             v-else
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="
                 formDialog.data.wallet == null ||
                 formDialog.data.name == null ||

lnbits/extensions/captcha/crud.py

@@ -18,7 +18,7 @@ async def create_captcha(
     captcha_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO captchas (id, wallet, url, memo, description, amount, remembers)
+        INSERT INTO captcha.captchas (id, wallet, url, memo, description, amount, remembers)
         VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
         (captcha_id, wallet_id, url, memo, description, amount, int(remembers)),
@@ -30,7 +30,9 @@ async def create_captcha(
 
 
 async def get_captcha(captcha_id: str) -> Optional[Captcha]:
-    row = await db.fetchone("SELECT * FROM captchas WHERE id = ?", (captcha_id,))
+    row = await db.fetchone(
+        "SELECT * FROM captcha.captchas WHERE id = ?", (captcha_id,)
+    )
 
     return Captcha.from_row(row) if row else None
 
@@ -41,11 +43,11 @@ async def get_captchas(wallet_ids: Union[str, List[str]]) -> List[Captcha]:
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM captchas WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM captcha.captchas WHERE wallet IN ({q})", (*wallet_ids,)
     )
 
     return [Captcha.from_row(row) for row in rows]
 
 
 async def delete_captcha(captcha_id: str) -> None:
-    await db.execute("DELETE FROM captchas WHERE id = ?", (captcha_id,))
+    await db.execute("DELETE FROM captcha.captchas WHERE id = ?", (captcha_id,))

lnbits/extensions/captcha/migrations.py

@@ -1,20 +1,19 @@
-from sqlalchemy.exc import OperationalError  # type: ignore
-
-
 async def m001_initial(db):
     """
     Initial captchas table.
     """
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS captchas (
+        CREATE TABLE captcha.captchas (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             secret TEXT NOT NULL,
             url TEXT NOT NULL,
             memo TEXT NOT NULL,
             amount INTEGER NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
@@ -24,44 +23,41 @@ async def m002_redux(db):
     """
     Creates an improved captchas table and migrates the existing data.
     """
-    try:
-        await db.execute("SELECT remembers FROM captchas")
+    await db.execute("ALTER TABLE captcha.captchas RENAME TO captchas_old")
+    await db.execute(
+        """
+        CREATE TABLE captcha.captchas (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            url TEXT NOT NULL,
+            memo TEXT NOT NULL,
+            description TEXT NULL,
+            amount INTEGER DEFAULT 0,
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """,
+            remembers INTEGER DEFAULT 0,
+            extras TEXT NULL
+        );
+    """
+    )
 
-    except OperationalError:
-        await db.execute("ALTER TABLE captchas RENAME TO captchas_old")
+    for row in [
+        list(row) for row in await db.fetchall("SELECT * FROM captcha.captchas_old")
+    ]:
         await db.execute(
             """
-            CREATE TABLE IF NOT EXISTS captchas (
-                id TEXT PRIMARY KEY,
-                wallet TEXT NOT NULL,
-                url TEXT NOT NULL,
-                memo TEXT NOT NULL,
-                description TEXT NULL,
-                amount INTEGER DEFAULT 0,
-                time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now')),
-                remembers INTEGER DEFAULT 0,
-                extras TEXT NULL
-            );
-        """
-        )
-        await db.execute("CREATE INDEX IF NOT EXISTS wallet_idx ON captchas (wallet)")
-
-        for row in [
-            list(row) for row in await db.fetchall("SELECT * FROM captchas_old")
-        ]:
-            await db.execute(
-                """
-                INSERT INTO captchas (
-                    id,
-                    wallet,
-                    url,
-                    memo,
-                    amount,
-                    time
-                )
-                VALUES (?, ?, ?, ?, ?, ?)
-                """,
-                (row[0], row[1], row[3], row[4], row[5], row[6]),
+            INSERT INTO captcha.captchas (
+                id,
+                wallet,
+                url,
+                memo,
+                amount,
+                time
             )
+            VALUES (?, ?, ?, ?, ?, ?)
+            """,
+            (row[0], row[1], row[3], row[4], row[5], row[6]),
+        )
 
-        await db.execute("DROP TABLE captchas_old")
+    await db.execute("DROP TABLE captcha.captchas_old")

lnbits/extensions/captcha/templates/captcha/display.html

@@ -24,7 +24,7 @@
                   dense
                   flat
                   icon="check"
-                  color="deep-purple"
+                  color="primary"
                   type="submit"
                   @click="createInvoice"
                   :disabled="userAmount < captchaAmount || paymentReq"

lnbits/extensions/captcha/templates/captcha/index.html

@@ -4,7 +4,7 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="formDialog.show = true"
+        <q-btn unelevated color="primary" @click="formDialog.show = true"
           >New captcha</q-btn
         >
       </q-card-section>
@@ -141,7 +141,7 @@
             <q-item-section avatar>
               <q-checkbox
                 v-model="formDialog.data.remembers"
-                color="deep-purple"
+                color="primary"
               ></q-checkbox>
             </q-item-section>
             <q-item-section>
@@ -157,7 +157,7 @@
         <div class="row q-mt-lg">
           <q-btn
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="formDialog.data.amount == null || formDialog.data.amount < 0 || formDialog.data.memo == null"
             type="submit"
             >Create captcha</q-btn

lnbits/extensions/copilot/README.md

@@ -0,0 +1,3 @@
+# StreamerCopilot
+
+Tool to help streamers accept sats for tips

lnbits/extensions/copilot/__init__.py

@@ -0,0 +1,17 @@
+from quart import Blueprint
+from lnbits.db import Database
+
+db = Database("ext_copilot")
+
+copilot_ext: Blueprint = Blueprint(
+    "copilot", __name__, static_folder="static", template_folder="templates"
+)
+
+from .views_api import *  # noqa
+from .views import *  # noqa
+from .lnurl import *  # noqa
+from .tasks import register_listeners
+
+from lnbits.tasks import record_async
+
+copilot_ext.record(record_async(register_listeners))

lnbits/extensions/copilot/config.json

@@ -0,0 +1,8 @@
+{
+  "name": "StreamerCopilot",
+  "short_description": "Video tips/animations/webhooks",
+  "icon": "face",
+  "contributors": [
+    "arcbtc"
+  ]
+}

lnbits/extensions/copilot/crud.py

@@ -0,0 +1,109 @@
+from typing import List, Optional, Union
+
+# from lnbits.db import open_ext_db
+from . import db
+from .models import Copilots
+
+from lnbits.helpers import urlsafe_short_hash
+
+from quart import jsonify
+
+
+###############COPILOTS##########################
+
+
+async def create_copilot(
+    title: str,
+    user: str,
+    lnurl_toggle: Optional[int] = 0,
+    wallet: Optional[str] = None,
+    animation1: Optional[str] = None,
+    animation2: Optional[str] = None,
+    animation3: Optional[str] = None,
+    animation1threshold: Optional[int] = None,
+    animation2threshold: Optional[int] = None,
+    animation3threshold: Optional[int] = None,
+    animation1webhook: Optional[str] = None,
+    animation2webhook: Optional[str] = None,
+    animation3webhook: Optional[str] = None,
+    lnurl_title: Optional[str] = None,
+    show_message: Optional[int] = 0,
+    show_ack: Optional[int] = 0,
+    show_price: Optional[int] = 0,
+    amount_made: Optional[int] = None,
+) -> Copilots:
+    copilot_id = urlsafe_short_hash()
+
+    await db.execute(
+        """
+        INSERT INTO copilots (
+            id,
+            "user",
+            lnurl_toggle,
+            wallet,
+            title,
+            animation1,
+            animation2,
+            animation3,
+            animation1threshold,
+            animation2threshold,
+            animation3threshold,
+            animation1webhook,
+            animation2webhook,
+            animation3webhook,
+            lnurl_title,
+            show_message,
+            show_ack,
+            show_price,
+            lnurl_title,
+            amount_made
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        """,
+        (
+            copilot_id,
+            user,
+            lnurl_toggle,
+            wallet,
+            title,
+            animation1,
+            animation2,
+            animation3,
+            animation1threshold,
+            animation2threshold,
+            animation3threshold,
+            animation1webhook,
+            animation2webhook,
+            animation3webhook,
+            lnurl_title,
+            show_message,
+            show_ack,
+            show_price,
+            lnurl_title,
+            0,
+        ),
+    )
+    return await get_copilot(copilot_id)
+
+
+async def update_copilot(copilot_id: str, **kwargs) -> Optional[Copilots]:
+    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
+    await db.execute(
+        f"UPDATE copilots SET {q} WHERE id = ?", (*kwargs.values(), copilot_id)
+    )
+    row = await db.fetchone("SELECT * FROM copilots WHERE id = ?", (copilot_id,))
+    return Copilots.from_row(row) if row else None
+
+
+async def get_copilot(copilot_id: str) -> Copilots:
+    row = await db.fetchone("SELECT * FROM copilots WHERE id = ?", (copilot_id,))
+    return Copilots.from_row(row) if row else None
+
+
+async def get_copilots(user: str) -> List[Copilots]:
+    rows = await db.fetchall("""SELECT * FROM copilots WHERE "user" = ?""", (user,))
+    return [Copilots.from_row(row) for row in rows]
+
+
+async def delete_copilot(copilot_id: str) -> None:
+    await db.execute("DELETE FROM copilots WHERE id = ?", (copilot_id,))

lnbits/extensions/copilot/lnurl.py

@@ -0,0 +1,86 @@
+import json
+import hashlib
+import math
+from quart import jsonify, url_for, request
+from lnurl import LnurlPayResponse, LnurlPayActionResponse, LnurlErrorResponse  # type: ignore
+from lnurl.types import LnurlPayMetadata
+from lnbits.core.services import create_invoice
+
+from . import copilot_ext
+from .crud import get_copilot
+
+
+@copilot_ext.route("/lnurl/<cp_id>", methods=["GET"])
+async def lnurl_response(cp_id):
+    cp = await get_copilot(cp_id)
+    if not cp:
+        return jsonify({"status": "ERROR", "reason": "Copilot not found."})
+
+    resp = LnurlPayResponse(
+        callback=url_for("copilot.lnurl_callback", cp_id=cp_id, _external=True),
+        min_sendable=10000,
+        max_sendable=50000000,
+        metadata=LnurlPayMetadata(json.dumps([["text/plain", str(cp.lnurl_title)]])),
+    )
+
+    params = resp.dict()
+    if cp.show_message:
+        params["commentAllowed"] = 300
+
+    return jsonify(params)
+
+
+@copilot_ext.route("/lnurl/cb/<cp_id>", methods=["GET"])
+async def lnurl_callback(cp_id):
+    cp = await get_copilot(cp_id)
+    if not cp:
+        return jsonify({"status": "ERROR", "reason": "Copilot not found."})
+
+    amount_received = int(request.args.get("amount"))
+
+    if amount_received < 10000:
+        return (
+            jsonify(
+                LnurlErrorResponse(
+                    reason=f"Amount {round(amount_received / 1000)} is smaller than minimum 10 sats."
+                ).dict()
+            ),
+        )
+    elif amount_received / 1000 > 10000000:
+        return (
+            jsonify(
+                LnurlErrorResponse(
+                    reason=f"Amount {round(amount_received / 1000)} is greater than maximum 50000."
+                ).dict()
+            ),
+        )
+    comment = ""
+    if request.args.get("comment"):
+        comment = request.args.get("comment")
+        if len(comment or "") > 300:
+            return jsonify(
+                LnurlErrorResponse(
+                    reason=f"Got a comment with {len(comment)} characters, but can only accept 300"
+                ).dict()
+            )
+        if len(comment) < 1:
+            comment = "none"
+
+    payment_hash, payment_request = await create_invoice(
+        wallet_id=cp.wallet,
+        amount=int(amount_received / 1000),
+        memo=cp.lnurl_title,
+        description_hash=hashlib.sha256(
+            (
+                LnurlPayMetadata(json.dumps([["text/plain", str(cp.lnurl_title)]]))
+            ).encode("utf-8")
+        ).digest(),
+        extra={"tag": "copilot", "copilot": cp.id, "comment": comment},
+    )
+    resp = LnurlPayActionResponse(
+        pr=payment_request,
+        success_action=None,
+        disposable=False,
+        routes=[],
+    )
+    return jsonify(resp.dict())

lnbits/extensions/copilot/migrations.py

@@ -0,0 +1,33 @@
+async def m001_initial(db):
+    """
+    Initial copilot table.
+    """
+
+    await db.execute(
+        f"""
+        CREATE TABLE copilot.copilots (
+            id TEXT NOT NULL PRIMARY KEY,
+            "user" TEXT,
+            title TEXT,
+            lnurl_toggle INTEGER,
+            wallet TEXT,
+            animation1 TEXT,
+            animation2 TEXT,
+            animation3 TEXT,
+            animation1threshold INTEGER,
+            animation2threshold INTEGER,
+            animation3threshold INTEGER,
+            animation1webhook TEXT,
+            animation2webhook TEXT,
+            animation3webhook TEXT,
+            lnurl_title TEXT,
+            show_message INTEGER,
+            show_ack INTEGER,
+            show_price INTEGER,
+            amount_made INTEGER,
+            fullscreen_cam INTEGER,
+            iframe_url TEXT,
+            timestamp TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+        );
+    """
+    )

lnbits/extensions/copilot/models.py

@@ -0,0 +1,41 @@
+from sqlite3 import Row
+from typing import NamedTuple
+import time
+from quart import url_for
+from lnurl import Lnurl, encode as lnurl_encode  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore
+
+
+class Copilots(NamedTuple):
+    id: str
+    user: str
+    title: str
+    lnurl_toggle: int
+    wallet: str
+    animation1: str
+    animation2: str
+    animation3: str
+    animation1threshold: int
+    animation2threshold: int
+    animation3threshold: int
+    animation1webhook: str
+    animation2webhook: str
+    animation3webhook: str
+    lnurl_title: str
+    show_message: int
+    show_ack: int
+    show_price: int
+    amount_made: int
+    timestamp: int
+    fullscreen_cam: int
+    iframe_url: str
+
+    @classmethod
+    def from_row(cls, row: Row) -> "Copilots":
+        return cls(**dict(row))
+
+    @property
+    def lnurl(self) -> Lnurl:
+        url = url_for("copilot.lnurl_response", cp_id=self.id, _external=True)
+        return lnurl_encode(url)

lnbits/extensions/copilot/tasks.py

@@ -0,0 +1,88 @@
+import trio  # type: ignore
+import json
+import httpx
+from quart import g, jsonify, url_for, websocket
+from http import HTTPStatus
+
+from lnbits.core import db as core_db
+from lnbits.core.models import Payment
+from lnbits.tasks import register_invoice_listener
+
+from .crud import get_copilot
+from .views import updater
+import shortuuid
+
+
+async def register_listeners():
+    invoice_paid_chan_send, invoice_paid_chan_recv = trio.open_memory_channel(2)
+    register_invoice_listener(invoice_paid_chan_send)
+    await wait_for_paid_invoices(invoice_paid_chan_recv)
+
+
+async def wait_for_paid_invoices(invoice_paid_chan: trio.MemoryReceiveChannel):
+    async for payment in invoice_paid_chan:
+        await on_invoice_paid(payment)
+
+
+async def on_invoice_paid(payment: Payment) -> None:
+    webhook = None
+    data = None
+    if "copilot" != payment.extra.get("tag"):
+        # not an copilot invoice
+        return
+
+    if payment.extra.get("wh_status"):
+        # this webhook has already been sent
+        return
+
+    copilot = await get_copilot(payment.extra.get("copilot", -1))
+
+    if not copilot:
+        return (
+            jsonify({"message": "Copilot link link does not exist."}),
+            HTTPStatus.NOT_FOUND,
+        )
+    if copilot.animation1threshold:
+        if int(payment.amount / 1000) >= copilot.animation1threshold:
+            data = copilot.animation1
+            webhook = copilot.animation1webhook
+        if copilot.animation2threshold:
+            if int(payment.amount / 1000) >= copilot.animation2threshold:
+                data = copilot.animation2
+                webhook = copilot.animation1webhook
+            if copilot.animation3threshold:
+                if int(payment.amount / 1000) >= copilot.animation3threshold:
+                    data = copilot.animation3
+                    webhook = copilot.animation1webhook
+    if webhook:
+        async with httpx.AsyncClient() as client:
+            try:
+                r = await client.post(
+                    webhook,
+                    json={
+                        "payment_hash": payment.payment_hash,
+                        "payment_request": payment.bolt11,
+                        "amount": payment.amount,
+                        "comment": payment.extra.get("comment"),
+                    },
+                    timeout=40,
+                )
+                await mark_webhook_sent(payment, r.status_code)
+            except (httpx.ConnectError, httpx.RequestError):
+                await mark_webhook_sent(payment, -1)
+    if payment.extra.get("comment"):
+        await updater(copilot.id, data, payment.extra.get("comment"))
+    else:
+        await updater(copilot.id, data, "none")
+
+
+async def mark_webhook_sent(payment: Payment, status: int) -> None:
+    payment.extra["wh_status"] = status
+
+    await core_db.execute(
+        """
+        UPDATE apipayments SET extra = ?
+        WHERE hash = ?
+        """,
+        (json.dumps(payment.extra), payment.payment_hash),
+    )

lnbits/extensions/copilot/templates/copilot/_api_docs.html

@@ -0,0 +1,172 @@
+<q-card>
+  <q-card-section>
+    <p>
+      StreamerCopilot: get tips via static QR (lnurl-pay) and show an
+      animation<br />
+      <small>
+        Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+      >
+    </p>
+  </q-card-section>
+  <q-expansion-item
+    group="extras"
+    icon="swap_vertical_circle"
+    label="API info"
+    :content-inset-level="0.5"
+  >
+    <q-expansion-item group="api" dense expand-separator label="Create copilot">
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">POST</span> /copilot/api/v1/copilot</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Body (application/json)
+          </h5>
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Returns 200 OK (application/json)
+          </h5>
+          <code>[&lt;copilot_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X POST {{ request.url_root }}api/v1/copilot -d '{"title":
+            &lt;string&gt;, "animation": &lt;string&gt;,
+            "show_message":&lt;string&gt;, "amount": &lt;integer&gt;,
+            "lnurl_title": &lt;string&gt;}' -H "Content-type: application/json"
+            -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item group="api" dense expand-separator label="Update copilot">
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">PUT</span>
+            /copilot/api/v1/copilot/&lt;copilot_id&gt;</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Body (application/json)
+          </h5>
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Returns 200 OK (application/json)
+          </h5>
+          <code>[&lt;copilot_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X POST {{ request.url_root
+            }}api/v1/copilot/&lt;copilot_id&gt; -d '{"title": &lt;string&gt;,
+            "animation": &lt;string&gt;, "show_message":&lt;string&gt;,
+            "amount": &lt;integer&gt;, "lnurl_title": &lt;string&gt;}' -H
+            "Content-type: application/json" -H "X-Api-Key:
+            {{g.user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+
+    <q-expansion-item group="api" dense expand-separator label="Get copilot">
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /copilot/api/v1/copilot/&lt;copilot_id&gt;</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Body (application/json)
+          </h5>
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Returns 200 OK (application/json)
+          </h5>
+          <code>[&lt;copilot_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.url_root }}api/v1/copilot/&lt;copilot_id&gt;
+            -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item group="api" dense expand-separator label="Get copilots">
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span> /copilot/api/v1/copilots</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Body (application/json)
+          </h5>
+          <h5 class="text-caption q-mt-sm q-mb-none">
+            Returns 200 OK (application/json)
+          </h5>
+          <code>[&lt;copilot_object&gt;, ...]</code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.url_root }}api/v1/copilots -H "X-Api-Key: {{
+            g.user.wallets[0].inkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Delete a pay link"
+      class="q-pb-md"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-pink">DELETE</span>
+            /copilot/api/v1/copilot/&lt;copilot_id&gt;</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">Returns 204 NO CONTENT</h5>
+          <code></code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X DELETE {{ request.url_root
+            }}api/v1/copilot/&lt;copilot_id&gt; -H "X-Api-Key: {{
+            g.user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-expansion-item
+      group="api"
+      dense
+      expand-separator
+      label="Trigger an animation"
+      class="q-pb-md"
+    >
+      <q-card>
+        <q-card-section>
+          <code
+            ><span class="text-blue">GET</span>
+            /api/v1/copilot/ws/&lt;copilot_id&gt;/&lt;comment&gt;/&lt;data&gt;</code
+          >
+          <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
+          <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
+          <h5 class="text-caption q-mt-sm q-mb-none">Returns 200</h5>
+          <code></code>
+          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
+          <code
+            >curl -X GET {{ request.url_root }}/api/v1/copilot/ws/&lt;string,
+            copilot_id&gt;/&lt;string, comment&gt;/&lt;string, gif name&gt; -H
+            "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
+          </code>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+  </q-expansion-item>
+</q-card>

lnbits/extensions/copilot/templates/copilot/compose.html

@@ -0,0 +1,289 @@
+{% extends "public.html" %} {% block page %}<q-page>
+  <video
+    autoplay="true"
+    id="videoScreen"
+    style="width: 100%"
+    class="fixed-bottom-right"
+  ></video>
+  <video
+    autoplay="true"
+    id="videoCamera"
+    style="width: 100%"
+    class="fixed-bottom-right"
+  ></video>
+  <img src="" style="width: 100%" id="animations" class="fixed-bottom-left" />
+
+  <div
+    v-if="copilot.lnurl_toggle == 1"
+    class="rounded-borders column fixed-right"
+    style="
+      width: 250px;
+      background-color: white;
+      height: 300px;
+      margin-top: 10%;
+    "
+  >
+    <div class="col">
+      <qrcode
+        :value="copilot.lnurl"
+        :options="{width:250}"
+        class="rounded-borders"
+      ></qrcode>
+      <center class="absolute-bottom" style="color: black; font-size: 20px">
+        {% raw %}{{ copilot.lnurl_title }}{% endraw %}
+      </center>
+    </div>
+  </div>
+
+  <h2
+    v-if="copilot.show_price != 0"
+    class="text-bold fixed-bottom-left"
+    style="
+      margin: 60px 60px;
+      font-size: 110px;
+      text-shadow: 4px 8px 4px black;
+      color: white;
+    "
+  >
+    {% raw %}{{ price }}{% endraw %}
+  </h2>
+  <p
+    v-if="copilot.show_ack != 0"
+    class="fixed-top"
+    style="
+      font-size: 22px;
+      text-shadow: 2px 4px 1px black;
+      color: white;
+      padding-left: 40%;
+    "
+  >
+    Powered by LNbits/StreamerCopilot
+  </p>
+</q-page>
+{% endblock %} {% block scripts %}
+<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
+<style>
+  body.body--dark .q-drawer,
+  body.body--dark .q-footer,
+  body.body--dark .q-header,
+  .q-drawer,
+  .q-footer,
+  .q-header {
+    display: none;
+  }
+  .q-page {
+    padding: 0px;
+  }
+</style>
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data() {
+      return {
+        price: '',
+        counter: 1,
+        colours: ['teal', 'purple', 'indigo', 'pink', 'green'],
+        copilot: {},
+        animQueue: [],
+        queue: false,
+        lnurl: ''
+      }
+    },
+    methods: {
+      showNotif: function (userMessage) {
+        var colour = this.colours[
+          Math.floor(Math.random() * this.colours.length)
+        ]
+        this.$q.notify({
+          color: colour,
+          icon: 'chat_bubble_outline',
+          html: true,
+          message: '<h4 style="color: white;">' + userMessage + '</h4>',
+          position: 'top-left',
+          timeout: 5000
+        })
+      },
+      openURL: function (url) {
+        return Quasar.utils.openURL(url)
+      },
+      initCamera() {
+        var video = document.querySelector('#videoCamera')
+
+        if (navigator.mediaDevices.getUserMedia) {
+          navigator.mediaDevices
+            .getUserMedia({video: true})
+            .then(function (stream) {
+              video.srcObject = stream
+            })
+            .catch(function (err0r) {
+              console.log('Something went wrong!')
+            })
+        }
+      },
+      initScreenShare() {
+        var video = document.querySelector('#videoScreen')
+        navigator.mediaDevices
+          .getDisplayMedia({video: true})
+          .then(function (stream) {
+            video.srcObject = stream
+          })
+          .catch(function (err0r) {
+            console.log('Something went wrong!')
+          })
+      },
+      pushAnim(content) {
+        document.getElementById('animations').style.width = content[0]
+        document.getElementById('animations').src = content[1]
+        if (content[2] != 'none') {
+          self.showNotif(content[2])
+        }
+        setTimeout(function () {
+          document.getElementById('animations').src = ''
+        }, 5000)
+      },
+      launch() {
+        self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/copilot/api/v1/copilot/ws/' +
+              self.copilot.id +
+              '/launching/rocket'
+          )
+          .then(function (response1) {
+            self.$q.notify({
+              color: 'green',
+              message: 'Sent!'
+            })
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+          })
+      }
+    },
+    mounted() {
+      this.initCamera()
+    },
+    created: function () {
+      self = this
+      self.copilot = JSON.parse(localStorage.getItem('copilot'))
+      LNbits.api
+        .request(
+          'GET',
+          '/copilot/api/v1/copilot/' + self.copilot.id,
+          localStorage.getItem('inkey')
+        )
+        .then(function (response) {
+          self.copilot = response.data
+        })
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
+
+      this.connectionBitStamp = new WebSocket('wss://ws.bitstamp.net')
+
+      const obj = JSON.stringify({
+        event: 'bts:subscribe',
+        data: {channel: 'live_trades_' + self.copilot.show_price}
+      })
+
+      this.connectionBitStamp.onmessage = function (e) {
+        if (self.copilot.show_price) {
+          if (self.copilot.show_price == 'btcusd') {
+            self.price = String(
+              new Intl.NumberFormat('en-US', {
+                style: 'currency',
+                currency: 'USD'
+              }).format(JSON.parse(e.data).data.price)
+            )
+          } else if (self.copilot.show_price == 'btceur') {
+            self.price = String(
+              new Intl.NumberFormat('en-US', {
+                style: 'currency',
+                currency: 'EUR'
+              }).format(JSON.parse(e.data).data.price)
+            )
+          } else if (self.copilot.show_price == 'btcgbp') {
+            self.price = String(
+              new Intl.NumberFormat('en-US', {
+                style: 'currency',
+                currency: 'GBP'
+              }).format(JSON.parse(e.data).data.price)
+            )
+          }
+        }
+      }
+      this.connectionBitStamp.onopen = () => this.connectionBitStamp.send(obj)
+
+      const fetch = data =>
+        new Promise(resolve => setTimeout(resolve, 5000, this.pushAnim(data)))
+
+      const addTask = (() => {
+        let pending = Promise.resolve()
+        const run = async data => {
+          try {
+            await pending
+          } finally {
+            return fetch(data)
+          }
+        }
+        return data => (pending = run(data))
+      })()
+
+      if (location.protocol !== 'http:') {
+        localUrl =
+          'wss://' +
+          document.domain +
+          ':' +
+          location.port +
+          '/copilot/ws/' +
+          self.copilot.id +
+          '/'
+      } else {
+        localUrl =
+          'ws://' +
+          document.domain +
+          ':' +
+          location.port +
+          '/copilot/ws/' +
+          self.copilot.id +
+          '/'
+      }
+      this.connection = new WebSocket(localUrl)
+      this.connection.onmessage = function (e) {
+        res = e.data.split('-')
+        if (res[0] == 'rocket') {
+          addTask(['40%', '/copilot/static/rocket.gif', res[1]])
+        }
+        if (res[0] == 'face') {
+          addTask(['35%', '/copilot/static/face.gif', res[1]])
+        }
+        if (res[0] == 'bitcoin') {
+          addTask(['30%', '/copilot/static/bitcoin.gif', res[1]])
+        }
+        if (res[0] == 'confetti') {
+          addTask(['100%', '/copilot/static/confetti.gif', res[1]])
+        }
+        if (res[0] == 'martijn') {
+          addTask(['40%', '/copilot/static/martijn.gif', res[1]])
+        }
+        if (res[0] == 'rick') {
+          addTask(['40%', '/copilot/static/rick.gif', res[1]])
+        }
+        if (res[0] == 'true') {
+          document.getElementById('videoCamera').style.width = '20%'
+          self.initScreenShare()
+        }
+        if (res[0] == 'false') {
+          document.getElementById('videoCamera').style.width = '100%'
+          document.getElementById('videoScreen').src = null
+        }
+      }
+      this.connection.onopen = () => this.launch
+    }
+  })
+</script>
+{% endblock %}

lnbits/extensions/copilot/templates/copilot/index.html

@@ -0,0 +1,637 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+<div class="row q-col-gutter-md">
+  <div class="col-12 col-md-7 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        {% raw %}
+        <q-btn unelevated color="primary" @click="formDialogCopilot.show = true"
+          >New copilot instance
+        </q-btn>
+      </q-card-section>
+    </q-card>
+
+    <q-card>
+      <q-card-section>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col">
+            <h5 class="text-subtitle1 q-my-none">Copilots</h5>
+          </div>
+
+          <div class="col-auto">
+            <q-input
+              borderless
+              dense
+              debounce="300"
+              v-model="filter"
+              placeholder="Search"
+            >
+              <template v-slot:append>
+                <q-icon name="search"></q-icon>
+              </template>
+            </q-input>
+            <q-btn flat color="grey" @click="exportcopilotCSV"
+              >Export to CSV</q-btn
+            >
+          </div>
+        </div>
+        <q-table
+          flat
+          dense
+          :data="CopilotLinks"
+          row-key="id"
+          :columns="CopilotsTable.columns"
+          :pagination.sync="CopilotsTable.pagination"
+          :filter="filter"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th style="width: 5%"></q-th>
+              <q-th style="width: 5%"></q-th>
+              <q-th style="width: 5%"></q-th>
+
+              <q-th
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                auto-width
+              >
+                <div v-if="col.name == 'id'"></div>
+                <div v-else>{{ col.label }}</div>
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td auto-width>
+                <q-btn
+                  unelevated
+                  dense
+                  size="xs"
+                  icon="apps"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  @click="openCopilotPanel(props.row.id)"
+                >
+                  <q-tooltip> Panel </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  unelevated
+                  dense
+                  size="xs"
+                  icon="face"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  @click="openCopilotCompose(props.row.id)"
+                >
+                  <q-tooltip> Compose window </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteCopilotLink(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                >
+                  <q-tooltip> Delete copilot </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="openUpdateCopilotLink(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                >
+                  <q-tooltip> Edit copilot </q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                auto-width
+              >
+                <div v-if="col.name == 'id'"></div>
+                <div v-else>{{ col.value }}</div>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  <div class="col-12 col-md-5 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">LNbits StreamCopilot Extension</h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-separator></q-separator>
+        <q-list> {% include "copilot/_api_docs.html" %} </q-list>
+      </q-card-section>
+    </q-card>
+  </div>
+  <q-dialog
+    v-model="formDialogCopilot.show"
+    position="top"
+    @hide="closeFormDialog"
+  >
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form @submit="sendFormDataCopilot" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialogCopilot.data.title"
+          type="text"
+          label="Title"
+        ></q-input>
+        <div class="row">
+          <q-checkbox
+            v-model="formDialogCopilot.data.lnurl_toggle"
+            label="Include lnurl payment QR? (requires https)"
+            left-label
+          ></q-checkbox>
+        </div>
+
+        <div v-if="formDialogCopilot.data.lnurl_toggle">
+          <q-checkbox
+            v-model="formDialogCopilot.data.show_message"
+            left-label
+            label="Show lnurl-pay messages? (supported by few wallets)"
+          ></q-checkbox>
+
+          <q-select
+            filled
+            dense
+            emit-value
+            v-model="formDialogCopilot.data.wallet"
+            :options="g.user.walletOptions"
+            label="Wallet *"
+          ></q-select>
+
+          <q-expansion-item
+            group="api"
+            dense
+            expand-separator
+            label="Payment threshold 1"
+          >
+            <q-card>
+              <q-card-section>
+                <div class="row">
+                  <div class="col">
+                    <q-select
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation1"
+                      :options="options"
+                      label="Animation"
+                    />
+                  </div>
+
+                  <div class="col q-pl-xs">
+                    <q-input
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation1threshold"
+                      type="number"
+                      label="From *sats"
+                      :min="10"
+                    >
+                    </q-input>
+                  </div>
+                  <div class="col q-pl-xs">
+                    <q-input
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation1webhook"
+                      type="text"
+                      label="Webhook"
+                    >
+                    </q-input>
+                  </div>
+                </div>
+              </q-card-section>
+            </q-card>
+          </q-expansion-item>
+
+          <q-expansion-item
+            group="api"
+            dense
+            expand-separator
+            label="Payment threshold 2 (Must be higher than last)"
+          >
+            <q-card>
+              <q-card-section>
+                <div
+                  class="row"
+                  v-if="formDialogCopilot.data.animation1threshold > 0"
+                >
+                  <div class="col">
+                    <q-select
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation2"
+                      :options="options"
+                      label="Animation"
+                    />
+                  </div>
+
+                  <div class="col q-pl-xs">
+                    <q-input
+                      filled
+                      dense
+                      v-model="formDialogCopilot.data.animation2threshold"
+                      type="number"
+                      label="From *sats"
+                      :min="formDialogCopilot.data.animation1threshold"
+                    >
+                    </q-input>
+                  </div>
+                  <div class="col q-pl-xs">
+                    <q-input
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation2webhook"
+                      type="text"
+                      label="Webhook"
+                    >
+                    </q-input>
+                  </div>
+                </div>
+              </q-card-section>
+            </q-card>
+          </q-expansion-item>
+
+          <q-expansion-item
+            group="api"
+            dense
+            expand-separator
+            label="Payment threshold 3 (Must be higher than last)"
+          >
+            <q-card>
+              <q-card-section>
+                <div
+                  class="row"
+                  v-if="formDialogCopilot.data.animation2threshold > formDialogCopilot.data.animation1threshold"
+                >
+                  <div class="col">
+                    <q-select
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation3"
+                      :options="options"
+                      label="Animation"
+                    />
+                  </div>
+
+                  <div class="col q-pl-xs">
+                    <q-input
+                      filled
+                      dense
+                      v-model="formDialogCopilot.data.animation3threshold"
+                      type="number"
+                      label="From *sats"
+                      :min="formDialogCopilot.data.animation2threshold"
+                    >
+                    </q-input>
+                  </div>
+                  <div class="col q-pl-xs">
+                    <q-input
+                      filled
+                      dense
+                      v-model.trim="formDialogCopilot.data.animation3webhook"
+                      type="text"
+                      label="Webhook"
+                    >
+                    </q-input>
+                  </div>
+                </div>
+              </q-card-section>
+            </q-card>
+          </q-expansion-item>
+
+          <q-input
+            filled
+            dense
+            v-model.trim="formDialogCopilot.data.lnurl_title"
+            type="text"
+            max="1440"
+            label="Lnurl title (message with QR code)"
+          >
+          </q-input>
+        </div>
+
+        <div class="q-gutter-sm">
+          <q-select
+            filled
+            dense
+            style="width: 50%"
+            v-model.trim="formDialogCopilot.data.show_price"
+            :options="currencyOptions"
+            label="Show price"
+          />
+        </div>
+        <div class="q-gutter-sm">
+          <div class="row">
+            <q-checkbox
+              v-model="formDialogCopilot.data.show_ack"
+              left-label
+              label="Show 'powered by LNbits'"
+            ></q-checkbox>
+          </div>
+        </div>
+        <div class="row q-mt-lg">
+          <q-btn
+            v-if="formDialogCopilot.data.id"
+            unelevated
+            color="primary"
+            :disable="
+                formDialogCopilot.data.title == ''"
+            type="submit"
+            >Update Copilot</q-btn
+          >
+          <q-btn
+            v-else
+            unelevated
+            color="primary"
+            :disable="
+                formDialogCopilot.data.title == ''"
+            type="submit"
+            >Create Copilot</q-btn
+          >
+          <q-btn @click="cancelCopilot" flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</div>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
+<style></style>
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  var mapCopilot = obj => {
+    obj._data = _.clone(obj)
+    obj.theTime = obj.time * 60 - (Date.now() / 1000 - obj.timestamp)
+    obj.time = obj.time + 'mins'
+
+    if (obj.time_elapsed) {
+      obj.date = 'Time elapsed'
+    } else {
+      obj.date = Quasar.utils.date.formatDate(
+        new Date((obj.theTime - 3600) * 1000),
+        'HH:mm:ss'
+      )
+    }
+    obj.displayComposeUrl = ['/copilot/cp/', obj.id].join('')
+    obj.displayPanelUrl = ['/copilot/', obj.id].join('')
+    return obj
+  }
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        filter: '',
+        CopilotLinks: [],
+        CopilotLinksObj: [],
+        CopilotsTable: {
+          columns: [
+            {
+              name: 'theId',
+              align: 'left',
+              label: 'id',
+              field: 'id'
+            },
+            {
+              name: 'lnurl_toggle',
+              align: 'left',
+              label: 'Show lnurl pay link',
+              field: 'lnurl_toggle'
+            },
+            {
+              name: 'title',
+              align: 'left',
+              label: 'title',
+              field: 'title'
+            },
+            {
+              name: 'amount_made',
+              align: 'left',
+              label: 'amount made',
+              field: 'amount_made'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
+        passedCopilot: {},
+        formDialog: {
+          show: false,
+          data: {}
+        },
+        formDialogCopilot: {
+          show: false,
+          data: {
+            lnurl_toggle: false,
+            show_message: false,
+            show_ack: false,
+            show_price: 'None',
+            title: ''
+          }
+        },
+        qrCodeDialog: {
+          show: false,
+          data: null
+        },
+        options: ['bitcoin', 'confetti', 'rocket', 'face', 'martijn', 'rick'],
+        currencyOptions: ['None', 'btcusd', 'btceur', 'btcgbp']
+      }
+    },
+    methods: {
+      cancelCopilot: function (data) {
+        var self = this
+        self.formDialogCopilot.show = false
+      },
+      closeFormDialog: function () {
+        this.formDialog.data = {
+          is_unique: false
+        }
+      },
+      sendFormDataCopilot: function () {
+        var self = this
+        if (self.formDialogCopilot.data.id) {
+          this.updateCopilot(
+            self.g.user.wallets[0].adminkey,
+            self.formDialogCopilot.data
+          )
+        } else {
+          this.createCopilot(
+            self.g.user.wallets[0].adminkey,
+            self.formDialogCopilot.data
+          )
+        }
+      },
+
+      createCopilot: function (wallet, data) {
+        var self = this
+        var updatedData = {}
+        for (const property in data) {
+          if (data[property]) {
+            updatedData[property] = data[property]
+          }
+          if (property == 'animation1threshold' && data[property]) {
+            updatedData[property] = parseInt(data[property])
+          }
+          if (property == 'animation2threshold' && data[property]) {
+            updatedData[property] = parseInt(data[property])
+          }
+          if (property == 'animation3threshold' && data[property]) {
+            updatedData[property] = parseInt(data[property])
+          }
+        }
+        LNbits.api
+          .request('POST', '/copilot/api/v1/copilot', wallet, updatedData)
+          .then(function (response) {
+            self.CopilotLinks.push(mapCopilot(response.data))
+            self.formDialogCopilot.show = false
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getCopilots: function () {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/copilot/api/v1/copilot',
+            this.g.user.wallets[0].inkey
+          )
+          .then(function (response) {
+            self.CopilotLinks = response.data.map(mapCopilot)
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getCopilot: function (copilot_id) {
+        var self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/copilot/api/v1/copilot/' + copilot_id,
+            this.g.user.wallets[0].inkey
+          )
+          .then(function (response) {
+            localStorage.setItem('copilot', JSON.stringify(response.data))
+            localStorage.setItem('inkey', self.g.user.wallets[0].inkey)
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      openCopilotCompose: function (copilot_id) {
+        this.getCopilot(copilot_id)
+        let params =
+          'scrollbars=no, resizable=no,status=no,location=no,toolbar=no,menubar=no,width=1200,height=644,left=410,top=100'
+        open('../copilot/cp/', '_blank', params)
+      },
+      openCopilotPanel: function (copilot_id) {
+        this.getCopilot(copilot_id)
+        let params =
+          'scrollbars=no, resizable=no,status=no,location=no,toolbar=no,menubar=no,width=300,height=450,left=10,top=400'
+        open('../copilot/pn/', '_blank', params)
+      },
+      deleteCopilotLink: function (copilotId) {
+        var self = this
+        var link = _.findWhere(this.CopilotLinks, {id: copilotId})
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this pay link?')
+          .onOk(function () {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/copilot/api/v1/copilot/' + copilotId,
+                self.g.user.wallets[0].adminkey
+              )
+              .then(function (response) {
+                self.CopilotLinks = _.reject(self.CopilotLinks, function (obj) {
+                  return obj.id === copilotId
+                })
+              })
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      openUpdateCopilotLink: function (copilotId) {
+        var self = this
+        var copilot = _.findWhere(this.CopilotLinks, {id: copilotId})
+        self.formDialogCopilot.data = _.clone(copilot._data)
+        self.formDialogCopilot.show = true
+      },
+      updateCopilot: function (wallet, data) {
+        var self = this
+        var updatedData = {}
+        for (const property in data) {
+          if (data[property]) {
+            updatedData[property] = data[property]
+          }
+          if (property == 'animation1threshold' && data[property]) {
+            updatedData[property] = parseInt(data[property])
+          }
+          if (property == 'animation2threshold' && data[property]) {
+            updatedData[property] = parseInt(data[property])
+          }
+          if (property == 'animation3threshold' && data[property]) {
+            updatedData[property] = parseInt(data[property])
+          }
+        }
+
+        LNbits.api
+          .request(
+            'PUT',
+            '/copilot/api/v1/copilot/' + updatedData.id,
+            wallet,
+            updatedData
+          )
+          .then(function (response) {
+            self.CopilotLinks = _.reject(self.CopilotLinks, function (obj) {
+              return obj.id === updatedData.id
+            })
+            self.CopilotLinks.push(mapCopilot(response.data))
+            self.formDialogCopilot.show = false
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      exportcopilotCSV: function () {
+        var self = this
+        LNbits.utils.exportCSV(self.CopilotsTable.columns, this.CopilotLinks)
+      }
+    },
+    created: function () {
+      var self = this
+      var getCopilots = this.getCopilots
+      getCopilots()
+    }
+  })
+</script>
+{% endblock %}

lnbits/extensions/copilot/templates/copilot/panel.html

@@ -0,0 +1,157 @@
+{% extends "public.html" %} {% block page %}
+<div class="q-pa-sm" style="width: 240px; margin: 10px auto">
+  <q-card class="my-card">
+    <div class="column">
+      <div class="col">
+        <center>
+          <q-btn
+            flat
+            round
+            dense
+            @click="openCompose"
+            icon="face"
+            style="font-size: 60px"
+          ></q-btn>
+        </center>
+      </div>
+      <center>
+        <div class="col" style="margin: 15px; font-size: 22px">
+          Title: {% raw %} {{ copilot.title }} {% endraw %}
+        </div>
+      </center>
+      <q-separator></q-separator>
+      <div class="col">
+        <div class="row">
+          <div class="col">
+            <q-btn
+              class="q-mt-sm q-ml-sm"
+              color="primary"
+              @click="fullscreenToggle"
+              label="Screen share"
+              size="sm"
+            >
+            </q-btn>
+          </div>
+        </div>
+        <div class="row q-pa-sm">
+          <div class="col">
+            <q-btn
+              style="width: 95%"
+              color="primary"
+              @click="animationBTN('rocket')"
+              label="rocket"
+              size="sm"
+            />
+          </div>
+          <div class="col">
+            <q-btn
+              style="width: 95%"
+              color="primary"
+              @click="animationBTN('confetti')"
+              label="confetti"
+              size="sm"
+            />
+          </div>
+          <div class="col">
+            <q-btn
+              style="width: 95%"
+              color="primary"
+              @click="animationBTN('face')"
+              label="face"
+              size="sm"
+            />
+          </div>
+        </div>
+        <div class="row q-pa-sm">
+          <div class="col">
+            <q-btn
+              style="width: 95%"
+              color="primary"
+              @click="animationBTN('rick')"
+              label="rick"
+              size="sm"
+            />
+          </div>
+          <div class="col">
+            <q-btn
+              style="width: 95%"
+              color="primary"
+              @click="animationBTN('martijn')"
+              label="martijn"
+              size="sm"
+            />
+          </div>
+          <div class="col">
+            <q-btn
+              style="width: 95%"
+              color="primary"
+              @click="animationBTN('bitcoin')"
+              label="bitcoin"
+              size="sm"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </q-card>
+</div>
+
+{% endblock %} {% block scripts %}
+<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
+<script>
+  Vue.component(VueQrcode.name, VueQrcode)
+
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data() {
+      return {
+        fullscreen_cam: true,
+        textareaModel: '',
+        iframe: '',
+        copilot: {}
+      }
+    },
+    methods: {
+      iframeChange: function (url) {
+        this.connection.send(String(url))
+      },
+      fullscreenToggle: function () {
+        self = this
+        self.animationBTN(String(this.fullscreen_cam))
+        if (this.fullscreen_cam) {
+          this.fullscreen_cam = false
+        } else {
+          this.fullscreen_cam = true
+        }
+      },
+      openCompose: function () {
+        let params =
+          'scrollbars=no, resizable=no,status=no,location=no,toolbar=no,menubar=no,width=1200,height=644,left=410,top=100'
+        open('../cp/', 'test', params)
+      },
+      animationBTN: function (name) {
+        self = this
+        LNbits.api
+          .request(
+            'GET',
+            '/copilot/api/v1/copilot/ws/' + self.copilot.id + '/none/' + name
+          )
+          .then(function (response1) {
+            self.$q.notify({
+              color: 'green',
+              message: 'Sent!'
+            })
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+          })
+      }
+    },
+    created: function () {
+      self = this
+      self.copilot = JSON.parse(localStorage.getItem('copilot'))
+    }
+  })
+</script>
+{% endblock %}

lnbits/extensions/copilot/views.py

@@ -0,0 +1,61 @@
+from quart import g, abort, render_template, jsonify, websocket
+from http import HTTPStatus
+import httpx
+from collections import defaultdict
+from lnbits.decorators import check_user_exists, validate_uuids
+from . import copilot_ext
+from .crud import get_copilot
+from quart import g, abort, render_template, jsonify, websocket
+from functools import wraps
+import trio
+import shortuuid
+from . import copilot_ext
+
+
+@copilot_ext.route("/")
+@validate_uuids(["usr"], required=True)
+@check_user_exists()
+async def index():
+    return await render_template("copilot/index.html", user=g.user)
+
+
+@copilot_ext.route("/cp/")
+async def compose():
+    return await render_template("copilot/compose.html")
+
+
+@copilot_ext.route("/pn/")
+async def panel():
+    return await render_template("copilot/panel.html")
+
+
+##################WEBSOCKET ROUTES########################
+
+# socket_relay is a list where the control panel or
+# lnurl endpoints can leave a message for the compose window
+
+connected_websockets = defaultdict(set)
+
+
+@copilot_ext.websocket("/ws/<id>/")
+async def wss(id):
+    copilot = await get_copilot(id)
+    if not copilot:
+        return "", HTTPStatus.FORBIDDEN
+    global connected_websockets
+    send_channel, receive_channel = trio.open_memory_channel(0)
+    connected_websockets[id].add(send_channel)
+    try:
+        while True:
+            data = await receive_channel.receive()
+            await websocket.send(data)
+    finally:
+        connected_websockets[id].remove(send_channel)
+
+
+async def updater(copilot_id, data, comment):
+    copilot = await get_copilot(copilot_id)
+    if not copilot:
+        return
+    for queue in connected_websockets[copilot_id]:
+        await queue.send(f"{data + '-' + comment}")

lnbits/extensions/copilot/views_api.py

@@ -0,0 +1,109 @@
+import hashlib
+from quart import g, jsonify, url_for, websocket
+from http import HTTPStatus
+import httpx
+
+from lnbits.core.crud import get_user
+from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from .views import updater
+
+from . import copilot_ext
+
+from lnbits.extensions.copilot import copilot_ext
+from .crud import (
+    create_copilot,
+    update_copilot,
+    get_copilot,
+    get_copilots,
+    delete_copilot,
+)
+
+#######################COPILOT##########################
+
+
+@copilot_ext.route("/api/v1/copilot", methods=["POST"])
+@copilot_ext.route("/api/v1/copilot/<copilot_id>", methods=["PUT"])
+@api_check_wallet_key("admin")
+@api_validate_post_request(
+    schema={
+        "title": {"type": "string", "empty": False, "required": True},
+        "lnurl_toggle": {"type": "integer", "empty": False},
+        "wallet": {"type": "string", "empty": False, "required": False},
+        "animation1": {"type": "string", "empty": True, "required": False},
+        "animation2": {"type": "string", "empty": True, "required": False},
+        "animation3": {"type": "string", "empty": True, "required": False},
+        "animation1threshold": {"type": "integer", "empty": True, "required": False},
+        "animation2threshold": {"type": "integer", "empty": True, "required": False},
+        "animation3threshold": {"type": "integer", "empty": True, "required": False},
+        "animation1webhook": {"type": "string", "empty": True, "required": False},
+        "animation2webhook": {"type": "string", "empty": True, "required": False},
+        "animation3webhook": {"type": "string", "empty": True, "required": False},
+        "lnurl_title": {"type": "string", "empty": True, "required": False},
+        "show_message": {"type": "integer", "empty": True, "required": False},
+        "show_ack": {"type": "integer", "empty": True},
+        "show_price": {"type": "string", "empty": True},
+    }
+)
+async def api_copilot_create_or_update(copilot_id=None):
+    if not copilot_id:
+        copilot = await create_copilot(user=g.wallet.user, **g.data)
+        return jsonify(copilot._asdict()), HTTPStatus.CREATED
+    else:
+        copilot = await update_copilot(copilot_id=copilot_id, **g.data)
+        return jsonify(copilot._asdict()), HTTPStatus.OK
+
+
+@copilot_ext.route("/api/v1/copilot", methods=["GET"])
+@api_check_wallet_key("invoice")
+async def api_copilots_retrieve():
+    try:
+        return (
+            jsonify(
+                [{**copilot._asdict()} for copilot in await get_copilots(g.wallet.user)]
+            ),
+            HTTPStatus.OK,
+        )
+    except:
+        return ""
+
+
+@copilot_ext.route("/api/v1/copilot/<copilot_id>", methods=["GET"])
+@api_check_wallet_key("invoice")
+async def api_copilot_retrieve(copilot_id):
+    copilot = await get_copilot(copilot_id)
+    if not copilot:
+        return jsonify({"message": "copilot does not exist"}), HTTPStatus.NOT_FOUND
+    if not copilot.lnurl_toggle:
+        return (
+            jsonify({**copilot._asdict()}),
+            HTTPStatus.OK,
+        )
+    return (
+        jsonify({**copilot._asdict(), **{"lnurl": copilot.lnurl}}),
+        HTTPStatus.OK,
+    )
+
+
+@copilot_ext.route("/api/v1/copilot/<copilot_id>", methods=["DELETE"])
+@api_check_wallet_key("admin")
+async def api_copilot_delete(copilot_id):
+    copilot = await get_copilot(copilot_id)
+
+    if not copilot:
+        return jsonify({"message": "Wallet link does not exist."}), HTTPStatus.NOT_FOUND
+
+    await delete_copilot(copilot_id)
+
+    return "", HTTPStatus.NO_CONTENT
+
+
+@copilot_ext.route("/api/v1/copilot/ws/<copilot_id>/<comment>/<data>", methods=["GET"])
+async def api_copilot_ws_relay(copilot_id, comment, data):
+    copilot = await get_copilot(copilot_id)
+    if not copilot:
+        return jsonify({"message": "copilot does not exist"}), HTTPStatus.NOT_FOUND
+    try:
+        await updater(copilot_id, data, comment)
+    except:
+        return "", HTTPStatus.FORBIDDEN
+    return "", HTTPStatus.OK

lnbits/extensions/diagonalley/crud.py

@@ -34,7 +34,7 @@ def create_diagonalleys_product(
         product_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
         db.execute(
             """
-            INSERT INTO products (id, wallet, product, categories, description, image, price, quantity)
+            INSERT INTO diagonalley.products (id, wallet, product, categories, description, image, price, quantity)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?)
             """,
             (
@@ -57,16 +57,21 @@ def update_diagonalleys_product(product_id: str, **kwargs) -> Optional[Indexers]
 
     with open_ext_db("diagonalley") as db:
         db.execute(
-            f"UPDATE products SET {q} WHERE id = ?", (*kwargs.values(), product_id)
+            f"UPDATE diagonalley.products SET {q} WHERE id = ?",
+            (*kwargs.values(), product_id),
+        )
+        row = db.fetchone(
+            "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
         )
-        row = db.fetchone("SELECT * FROM products WHERE id = ?", (product_id,))
 
     return get_diagonalleys_indexer(product_id)
 
 
 def get_diagonalleys_product(product_id: str) -> Optional[Products]:
     with open_ext_db("diagonalley") as db:
-        row = db.fetchone("SELECT * FROM products WHERE id = ?", (product_id,))
+        row = db.fetchone(
+            "SELECT * FROM diagonalley.products WHERE id = ?", (product_id,)
+        )
 
     return Products(**row) if row else None
 
@@ -78,7 +83,7 @@ def get_diagonalleys_products(wallet_ids: Union[str, List[str]]) -> List[Product
     with open_ext_db("diagonalley") as db:
         q = ",".join(["?"] * len(wallet_ids))
         rows = db.fetchall(
-            f"SELECT * FROM products WHERE wallet IN ({q})", (*wallet_ids,)
+            f"SELECT * FROM diagonalley.products WHERE wallet IN ({q})", (*wallet_ids,)
         )
 
     return [Products(**row) for row in rows]
@@ -86,7 +91,7 @@ def get_diagonalleys_products(wallet_ids: Union[str, List[str]]) -> List[Product
 
 def delete_diagonalleys_product(product_id: str) -> None:
     with open_ext_db("diagonalley") as db:
-        db.execute("DELETE FROM products WHERE id = ?", (product_id,))
+        db.execute("DELETE FROM diagonalley.products WHERE id = ?", (product_id,))
 
 
 ###Indexers
@@ -106,7 +111,7 @@ def create_diagonalleys_indexer(
         indexer_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
         db.execute(
             """
-            INSERT INTO indexers (id, wallet, shopname, indexeraddress, online, rating, shippingzone1, shippingzone2, zone1cost, zone2cost, email)
+            INSERT INTO diagonalley.indexers (id, wallet, shopname, indexeraddress, online, rating, shippingzone1, shippingzone2, zone1cost, zone2cost, email)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
             (
@@ -131,16 +136,21 @@ def update_diagonalleys_indexer(indexer_id: str, **kwargs) -> Optional[Indexers]
 
     with open_ext_db("diagonalley") as db:
         db.execute(
-            f"UPDATE indexers SET {q} WHERE id = ?", (*kwargs.values(), indexer_id)
+            f"UPDATE diagonalley.indexers SET {q} WHERE id = ?",
+            (*kwargs.values(), indexer_id),
+        )
+        row = db.fetchone(
+            "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
         )
-        row = db.fetchone("SELECT * FROM indexers WHERE id = ?", (indexer_id,))
 
     return get_diagonalleys_indexer(indexer_id)
 
 
 def get_diagonalleys_indexer(indexer_id: str) -> Optional[Indexers]:
     with open_ext_db("diagonalley") as db:
-        roww = db.fetchone("SELECT * FROM indexers WHERE id = ?", (indexer_id,))
+        roww = db.fetchone(
+            "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
+        )
     try:
         x = httpx.get(roww["indexeraddress"] + "/" + roww["ratingkey"])
         if x.status_code == 200:
@@ -148,7 +158,7 @@ def get_diagonalleys_indexer(indexer_id: str) -> Optional[Indexers]:
             print("poo")
             with open_ext_db("diagonalley") as db:
                 db.execute(
-                    "UPDATE indexers SET online = ? WHERE id = ?",
+                    "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
                     (
                         True,
                         indexer_id,
@@ -157,7 +167,7 @@ def get_diagonalleys_indexer(indexer_id: str) -> Optional[Indexers]:
         else:
             with open_ext_db("diagonalley") as db:
                 db.execute(
-                    "UPDATE indexers SET online = ? WHERE id = ?",
+                    "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
                     (
                         False,
                         indexer_id,
@@ -166,7 +176,9 @@ def get_diagonalleys_indexer(indexer_id: str) -> Optional[Indexers]:
     except:
         print("An exception occurred")
     with open_ext_db("diagonalley") as db:
-        row = db.fetchone("SELECT * FROM indexers WHERE id = ?", (indexer_id,))
+        row = db.fetchone(
+            "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
+        )
     return Indexers(**row) if row else None
 
 
@@ -177,7 +189,7 @@ def get_diagonalleys_indexers(wallet_ids: Union[str, List[str]]) -> List[Indexer
     with open_ext_db("diagonalley") as db:
         q = ",".join(["?"] * len(wallet_ids))
         rows = db.fetchall(
-            f"SELECT * FROM indexers WHERE wallet IN ({q})", (*wallet_ids,)
+            f"SELECT * FROM diagonalley.indexers WHERE wallet IN ({q})", (*wallet_ids,)
         )
 
         for r in rows:
@@ -186,7 +198,7 @@ def get_diagonalleys_indexers(wallet_ids: Union[str, List[str]]) -> List[Indexer
                 if x.status_code == 200:
                     with open_ext_db("diagonalley") as db:
                         db.execute(
-                            "UPDATE indexers SET online = ? WHERE id = ?",
+                            "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
                             (
                                 True,
                                 r["id"],
@@ -195,7 +207,7 @@ def get_diagonalleys_indexers(wallet_ids: Union[str, List[str]]) -> List[Indexer
                 else:
                     with open_ext_db("diagonalley") as db:
                         db.execute(
-                            "UPDATE indexers SET online = ? WHERE id = ?",
+                            "UPDATE diagonalley.indexers SET online = ? WHERE id = ?",
                             (
                                 False,
                                 r["id"],
@@ -206,14 +218,14 @@ def get_diagonalleys_indexers(wallet_ids: Union[str, List[str]]) -> List[Indexer
     with open_ext_db("diagonalley") as db:
         q = ",".join(["?"] * len(wallet_ids))
         rows = db.fetchall(
-            f"SELECT * FROM indexers WHERE wallet IN ({q})", (*wallet_ids,)
+            f"SELECT * FROM diagonalley.indexers WHERE wallet IN ({q})", (*wallet_ids,)
         )
     return [Indexers(**row) for row in rows]
 
 
 def delete_diagonalleys_indexer(indexer_id: str) -> None:
     with open_ext_db("diagonalley") as db:
-        db.execute("DELETE FROM indexers WHERE id = ?", (indexer_id,))
+        db.execute("DELETE FROM diagonalley.indexers WHERE id = ?", (indexer_id,))
 
 
 ###Orders
@@ -236,7 +248,7 @@ def create_diagonalleys_order(
         order_id = urlsafe_b64encode(uuid4().bytes_le).decode("utf-8")
         db.execute(
             """
-            INSERT INTO orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
+            INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
             (
@@ -259,7 +271,7 @@ def create_diagonalleys_order(
 
 def get_diagonalleys_order(order_id: str) -> Optional[Orders]:
     with open_ext_db("diagonalley") as db:
-        row = db.fetchone("SELECT * FROM orders WHERE id = ?", (order_id,))
+        row = db.fetchone("SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,))
 
     return Orders(**row) if row else None
 
@@ -271,25 +283,26 @@ def get_diagonalleys_orders(wallet_ids: Union[str, List[str]]) -> List[Orders]:
     with open_ext_db("diagonalley") as db:
         q = ",".join(["?"] * len(wallet_ids))
         rows = db.fetchall(
-            f"SELECT * FROM orders WHERE wallet IN ({q})", (*wallet_ids,)
+            f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})", (*wallet_ids,)
         )
     for r in rows:
         PAID = (await WALLET.get_invoice_status(r["invoiceid"])).paid
         if PAID:
             with open_ext_db("diagonalley") as db:
                 db.execute(
-                    "UPDATE orders SET paid = ? WHERE id = ?",
+                    "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
                     (
                         True,
                         r["id"],
                     ),
                 )
                 rows = db.fetchall(
-                    f"SELECT * FROM orders WHERE wallet IN ({q})", (*wallet_ids,)
+                    f"SELECT * FROM diagonalley.orders WHERE wallet IN ({q})",
+                    (*wallet_ids,),
                 )
     return [Orders(**row) for row in rows]
 
 
 def delete_diagonalleys_order(order_id: str) -> None:
     with open_ext_db("diagonalley") as db:
-        db.execute("DELETE FROM orders WHERE id = ?", (order_id,))
+        db.execute("DELETE FROM diagonalley.orders WHERE id = ?", (order_id,))

lnbits/extensions/diagonalley/migrations.py

@@ -4,7 +4,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS products (
+        CREATE TABLE diagonalley.products (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             product TEXT NOT NULL,
@@ -22,7 +22,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS indexers (
+        CREATE TABLE diagonalley.indexers (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             shopname TEXT NOT NULL,
@@ -43,7 +43,7 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS orders (
+        CREATE TABLE diagonalley.orders (
             id TEXT PRIMARY KEY,
             productid TEXT NOT NULL,
             wallet TEXT NOT NULL,

lnbits/extensions/diagonalley/templates/diagonalley/index.html

@@ -4,10 +4,10 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="productDialog.show = true"
+        <q-btn unelevated color="primary" @click="productDialog.show = true"
           >New Product</q-btn
         >
-        <q-btn unelevated color="deep-purple" @click="indexerDialog.show = true"
+        <q-btn unelevated color="primary" @click="indexerDialog.show = true"
           >New Indexer
           <q-tooltip>
             Frontend shop your stall will list its products in
@@ -282,7 +282,7 @@
           <q-btn
             v-if="productDialog.data.id"
             unelevated
-            color="deep-purple"
+            color="primary"
             type="submit"
             >Update Product</q-btn
           >
@@ -290,7 +290,7 @@
           <q-btn
             v-else
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="productDialog.data.image == null
               || productDialog.data.product == null
               || productDialog.data.description == null
@@ -374,7 +374,7 @@
           <q-btn
             v-if="indexerDialog.data.id"
             unelevated
-            color="deep-purple"
+            color="primary"
             type="submit"
             >Update Indexer</q-btn
           >
@@ -382,7 +382,7 @@
           <q-btn
             v-else
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="indexerDialog.data.shopname == null
               || indexerDialog.data.shippingzone1 == null
               || indexerDialog.data.indexeraddress == null

lnbits/extensions/diagonalley/views_api.py

@@ -230,7 +230,7 @@ async def api_diagonalley_order_delete(order_id):
 async def api_diagonalleys_order_paid(order_id):
     with open_ext_db("diagonalley") as db:
         db.execute(
-            "UPDATE orders SET paid = ? WHERE id = ?",
+            "UPDATE diagonalley.orders SET paid = ? WHERE id = ?",
             (
                 True,
                 order_id,
@@ -244,13 +244,15 @@ async def api_diagonalleys_order_paid(order_id):
 async def api_diagonalleys_order_shipped(order_id):
     with open_ext_db("diagonalley") as db:
         db.execute(
-            "UPDATE orders SET shipped = ? WHERE id = ?",
+            "UPDATE diagonalley.orders SET shipped = ? WHERE id = ?",
             (
                 True,
                 order_id,
             ),
         )
-        order = db.fetchone("SELECT * FROM orders WHERE id = ?", (order_id,))
+        order = db.fetchone(
+            "SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
+        )
 
     return (
         jsonify(
@@ -268,12 +270,16 @@ async def api_diagonalleys_order_shipped(order_id):
 )
 async def api_diagonalleys_stall_products(indexer_id):
     with open_ext_db("diagonalley") as db:
-        rows = db.fetchone("SELECT * FROM indexers WHERE id = ?", (indexer_id,))
+        rows = db.fetchone(
+            "SELECT * FROM diagonalley.indexers WHERE id = ?", (indexer_id,)
+        )
         print(rows[1])
         if not rows:
             return jsonify({"message": "Indexer does not exist."}), HTTPStatus.NOT_FOUND
 
-        products = db.fetchone("SELECT * FROM products WHERE wallet = ?", (rows[1],))
+        products = db.fetchone(
+            "SELECT * FROM diagonalley.products WHERE wallet = ?", (rows[1],)
+        )
         if not products:
             return jsonify({"message": "No products"}), HTTPStatus.NOT_FOUND
 
@@ -293,7 +299,9 @@ async def api_diagonalleys_stall_products(indexer_id):
 )
 async def api_diagonalleys_stall_checkshipped(checking_id):
     with open_ext_db("diagonalley") as db:
-        rows = db.fetchone("SELECT * FROM orders WHERE invoiceid = ?", (checking_id,))
+        rows = db.fetchone(
+            "SELECT * FROM diagonalley.orders WHERE invoiceid = ?", (checking_id,)
+        )
 
     return jsonify({"shipped": rows["shipped"]}), HTTPStatus.OK
 
@@ -329,7 +337,7 @@ async def api_diagonalley_stall_order(indexer_id):
     with open_ext_db("diagonalley") as db:
         db.execute(
             """
-            INSERT INTO orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
+            INSERT INTO diagonalley.orders (id, productid, wallet, product, quantity, shippingzone, address, email, invoiceid, paid, shipped)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
             (

lnbits/extensions/events/crud.py

@@ -14,7 +14,7 @@ async def create_ticket(
 ) -> Tickets:
     await db.execute(
         """
-        INSERT INTO ticket (id, wallet, event, name, email, registered, paid)
+        INSERT INTO events.ticket (id, wallet, event, name, email, registered, paid)
         VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
         (payment_hash, wallet, event, name, email, False, False),
@@ -26,11 +26,11 @@ async def create_ticket(
 
 
 async def set_ticket_paid(payment_hash: str) -> Tickets:
-    row = await db.fetchone("SELECT * FROM ticket WHERE id = ?", (payment_hash,))
+    row = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (payment_hash,))
     if row[6] != True:
         await db.execute(
             """
-            UPDATE ticket
+            UPDATE events.ticket
             SET paid = true
             WHERE id = ?
             """,
@@ -44,7 +44,7 @@ async def set_ticket_paid(payment_hash: str) -> Tickets:
         amount_tickets = eventdata.amount_tickets - 1
         await db.execute(
             """
-            UPDATE events
+            UPDATE events.events
             SET sold = ?, amount_tickets = ?
             WHERE id = ?
             """,
@@ -57,7 +57,7 @@ async def set_ticket_paid(payment_hash: str) -> Tickets:
 
 
 async def get_ticket(payment_hash: str) -> Optional[Tickets]:
-    row = await db.fetchone("SELECT * FROM ticket WHERE id = ?", (payment_hash,))
+    row = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (payment_hash,))
     return Tickets(**row) if row else None
 
 
@@ -67,13 +67,13 @@ async def get_tickets(wallet_ids: Union[str, List[str]]) -> List[Tickets]:
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM ticket WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM events.ticket WHERE wallet IN ({q})", (*wallet_ids,)
     )
     return [Tickets(**row) for row in rows]
 
 
 async def delete_ticket(payment_hash: str) -> None:
-    await db.execute("DELETE FROM ticket WHERE id = ?", (payment_hash,))
+    await db.execute("DELETE FROM events.ticket WHERE id = ?", (payment_hash,))
 
 
 # EVENTS
@@ -93,7 +93,7 @@ async def create_event(
     event_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO events (id, wallet, name, info, closing_date, event_start_date, event_end_date, amount_tickets, price_per_ticket, sold)
+        INSERT INTO events.events (id, wallet, name, info, closing_date, event_start_date, event_end_date, amount_tickets, price_per_ticket, sold)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -118,7 +118,7 @@ async def create_event(
 async def update_event(event_id: str, **kwargs) -> Events:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE events SET {q} WHERE id = ?", (*kwargs.values(), event_id)
+        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"
@@ -126,7 +126,7 @@ async def update_event(event_id: str, **kwargs) -> Events:
 
 
 async def get_event(event_id: str) -> Optional[Events]:
-    row = await db.fetchone("SELECT * FROM events WHERE id = ?", (event_id,))
+    row = await db.fetchone("SELECT * FROM events.events WHERE id = ?", (event_id,))
     return Events(**row) if row else None
 
 
@@ -136,14 +136,14 @@ async def get_events(wallet_ids: Union[str, List[str]]) -> List[Events]:
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM events WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM events.events WHERE wallet IN ({q})", (*wallet_ids,)
     )
 
     return [Events(**row) for row in rows]
 
 
 async def delete_event(event_id: str) -> None:
-    await db.execute("DELETE FROM events WHERE id = ?", (event_id,))
+    await db.execute("DELETE FROM events.events WHERE id = ?", (event_id,))
 
 
 # EVENTTICKETS
@@ -151,13 +151,18 @@ async def delete_event(event_id: str) -> None:
 
 async def get_event_tickets(event_id: str, wallet_id: str) -> List[Tickets]:
     rows = await db.fetchall(
-        "SELECT * FROM ticket WHERE wallet = ? AND event = ?", (wallet_id, event_id)
+        "SELECT * FROM events.ticket WHERE wallet = ? AND event = ?",
+        (wallet_id, event_id),
     )
     return [Tickets(**row) for row in rows]
 
 
 async def reg_ticket(ticket_id: str) -> List[Tickets]:
-    await db.execute("UPDATE ticket SET registered = ? WHERE id = ?", (True, ticket_id))
-    ticket = await db.fetchone("SELECT * FROM ticket WHERE id = ?", (ticket_id,))
-    rows = await db.fetchall("SELECT * FROM ticket WHERE event = ?", (ticket[1],))
+    await db.execute(
+        "UPDATE events.ticket SET registered = ? 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 [Tickets(**row) for row in rows]

lnbits/extensions/events/migrations.py

@@ -2,7 +2,7 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS events (
+        CREATE TABLE events.events (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
@@ -13,21 +13,25 @@ async def m001_initial(db):
             amount_tickets INTEGER NOT NULL,
             price_per_ticket INTEGER NOT NULL,
             sold INTEGER NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS tickets (
+        CREATE TABLE events.tickets (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             event TEXT NOT NULL,
             name TEXT NOT NULL,
             email TEXT NOT NULL,
             registered BOOLEAN NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
@@ -37,7 +41,7 @@ async def m002_changed(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS ticket (
+        CREATE TABLE events.ticket (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             event TEXT NOT NULL,
@@ -45,12 +49,14 @@ async def m002_changed(db):
             email TEXT NOT NULL,
             registered BOOLEAN NOT NULL,
             paid BOOLEAN NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
 
-    for row in [list(row) for row in await db.fetchall("SELECT * FROM tickets")]:
+    for row in [list(row) for row in await db.fetchall("SELECT * FROM events.tickets")]:
         usescsv = ""
 
         for i in range(row[5]):
@@ -61,7 +67,7 @@ async def m002_changed(db):
         usescsv = usescsv[1:]
         await db.execute(
             """
-            INSERT INTO ticket (
+            INSERT INTO events.ticket (
                 id,
                 wallet,
                 event,
@@ -82,4 +88,4 @@ async def m002_changed(db):
                 True,
             ),
         )
-    await db.execute("DROP TABLE tickets")
+    await db.execute("DROP TABLE events.tickets")

lnbits/extensions/events/templates/events/display.html

@@ -26,7 +26,7 @@
           <div class="row q-mt-lg">
             <q-btn
               unelevated
-              color="deep-purple"
+              color="primary"
               :disable="formDialog.data.name == '' || formDialog.data.email == '' || paymentReq"
               type="submit"
               >Submit</q-btn
@@ -46,7 +46,7 @@
           size="xl"
           :href="ticketLink.data.link"
           target="_blank"
-          color="deep-purple"
+          color="primary"
           type="a"
           >Link to your ticket!</q-btn
         >

lnbits/extensions/events/templates/events/index.html

@@ -4,7 +4,7 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="formDialog.show = true"
+        <q-btn unelevated color="primary" @click="formDialog.show = true"
           >New Event</q-btn
         >
       </q-card-section>
@@ -267,14 +267,14 @@
           <q-btn
             v-if="formDialog.data.id"
             unelevated
-            color="deep-purple"
+            color="primary"
             type="submit"
             >Update Event</q-btn
           >
           <q-btn
             v-else
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="formDialog.data.wallet == null || formDialog.data.name == null || formDialog.data.info == null || formDialog.data.closing_date == null || formDialog.data.event_start_date == null || formDialog.data.event_end_date == null || formDialog.data.amount_tickets == null || formDialog.data.price_per_ticket == null"
             type="submit"
             >Create Event</q-btn

lnbits/extensions/events/templates/events/register.html

@@ -10,7 +10,7 @@
 
           <br />
 
-          <q-btn unelevated color="deep-purple" @click="showCamera" size="xl"
+          <q-btn unelevated color="primary" @click="showCamera" size="xl"
             >Scan ticket</q-btn
           >
         </center>
@@ -82,7 +82,7 @@
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
   Vue.use(VueQrcodeReader)
-  var mapEvents = function(obj) {
+  var mapEvents = function (obj) {
     obj.date = Quasar.utils.date.formatDate(
       new Date(obj.time * 1000),
       'YYYY-MM-DD HH:mm'
@@ -94,7 +94,7 @@
   new Vue({
     el: '#vue',
     mixins: [windowMixin],
-    data: function() {
+    data: function () {
       return {
         tickets: [],
         ticketsTable: {
@@ -119,35 +119,35 @@
       }
     },
     methods: {
-      hoverEmail: function(tmp) {
+      hoverEmail: function (tmp) {
         this.tickets.data.emailtemp = tmp
       },
-      closeCamera: function() {
+      closeCamera: function () {
         this.sendCamera.show = false
       },
-      showCamera: function() {
+      showCamera: function () {
         this.sendCamera.show = true
       },
-      decodeQR: function(res) {
+      decodeQR: function (res) {
         this.sendCamera.show = false
         var self = this
 
         LNbits.api
           .request('GET', '/events/api/v1/register/ticket/' + res)
-          .then(function(response) {
+          .then(function (response) {
             self.$q.notify({
               type: 'positive',
               message: 'Registered!'
             })
-            setTimeout(function() {
+            setTimeout(function () {
               window.location.reload()
             }, 2000)
           })
-          .catch(function(error) {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       },
-      getEventTickets: function() {
+      getEventTickets: function () {
         var self = this
         console.log('obj')
         LNbits.api
@@ -155,17 +155,17 @@
             'GET',
             '/events/api/v1/eventtickets/{{ wallet_id }}/{{ event_id }}'
           )
-          .then(function(response) {
-            self.tickets = response.data.map(function(obj) {
+          .then(function (response) {
+            self.tickets = response.data.map(function (obj) {
               return mapEvents(obj)
             })
           })
-          .catch(function(error) {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       }
     },
-    created: function() {
+    created: function () {
       this.getEventTickets()
     }
   })

lnbits/extensions/example/migrations.py

@@ -1,11 +1,10 @@
 # async def m001_initial(db):
-
 #    await db.execute(
-#        """
-#        CREATE TABLE IF NOT EXISTS example (
+#        f"""
+#        CREATE TABLE example.example (
 #            id TEXT PRIMARY KEY,
 #            wallet TEXT NOT NULL,
-#            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+#            time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
 #        );
 #    """
 #    )

lnbits/extensions/hivemind/README.md

@@ -0,0 +1,3 @@
+<h1>Hivemind</h1>
+
+Placeholder for a future <a href="https://bitcoinhivemind.com/">Bitcoin Hivemind</a> extension.

lnbits/extensions/hivemind/__init__.py

@@ -0,0 +1,11 @@
+from quart import Blueprint
+from lnbits.db import Database
+
+db = Database("ext_hivemind")
+
+hivemind_ext: Blueprint = Blueprint(
+    "hivemind", __name__, static_folder="static", template_folder="templates"
+)
+
+
+from .views import *  # noqa

lnbits/extensions/hivemind/config.json

@@ -0,0 +1,6 @@
+{
+    "name": "Hivemind",
+    "short_description": "Make cheap talk expensive!",
+    "icon": "batch_prediction",
+    "contributors": ["fiatjaf"]
+}

lnbits/extensions/hivemind/migrations.py

@@ -0,0 +1,10 @@
+# async def m001_initial(db):
+#    await db.execute(
+#        f"""
+#        CREATE TABLE hivemind.hivemind (
+#            id TEXT PRIMARY KEY,
+#            wallet TEXT NOT NULL,
+#            time TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+#        );
+#    """
+#    )

lnbits/extensions/hivemind/models.py

@@ -0,0 +1,11 @@
+# from sqlite3 import Row
+# from typing import NamedTuple
+
+
+# class Example(NamedTuple):
+#    id: str
+#    wallet: str
+#
+#    @classmethod
+#    def from_row(cls, row: Row) -> "Example":
+#        return cls(**dict(row))

lnbits/extensions/hivemind/templates/hivemind/index.html

@@ -0,0 +1,35 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+<q-card>
+  <q-card-section>
+    <h5 class="text-subtitle1 q-mt-none q-mb-md">
+      This extension is just a placeholder for now.
+    </h5>
+    <p>
+      <a href="https://bitcoinhivemind.com/">Hivemind</a> is a Bitcoin sidechain
+      project for a peer-to-peer oracle protocol that absorbs accurate data into
+      a blockchain so that Bitcoin users can speculate in prediction markets.
+    </p>
+    <p>
+      These markets have the potential to revolutionize the emergence of
+      diffusion of knowledge in society and fix all sorts of problems in the
+      world.
+    </p>
+    <p>
+      This extension will become fully operative when the
+      <a href="https://drivechain.xyz/">BIP300</a> soft-fork gets activated and
+      Bitcoin Hivemind is launched.
+    </p>
+  </q-card-section>
+</q-card>
+{% endblock %} {% block scripts %} {{ window_vars(user) }}
+<script>
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {}
+    }
+  })
+</script>
+{% endblock %}

lnbits/extensions/hivemind/views.py

@@ -0,0 +1,12 @@
+from quart import g, render_template
+
+from lnbits.decorators import check_user_exists, validate_uuids
+
+from . import hivemind_ext
+
+
+@hivemind_ext.route("/")
+@validate_uuids(["usr"], required=True)
+@check_user_exists()
+async def index():
+    return await render_template("hivemind/index.html", user=g.user)

lnbits/extensions/jukebox/README.md

@@ -1,5 +1,36 @@
 # Jukebox
 
-To use this extension you need a Spotify client ID and client secret. You get these by creating an app in the Spotify developers dashboard here https://developer.spotify.com/dashboard/applications
+## An actual Jukebox where users pay sats to play their favourite music from your playlists
 
-Select the playlists you want people to be able to pay for, share the frontend page, profit :)
+**Note:** To use this extension you need a Premium Spotify subscription.
+
+## Usage
+
+1. Click on "ADD SPOTIFY JUKEBOX"\
+   ![add jukebox](https://i.imgur.com/NdVoKXd.png)
+2. Follow the steps required on the form\
+
+   - give your jukebox a name
+   - select a wallet to receive payment
+   - define the price a user must pay to select a song\
+     ![pick wallet price](https://i.imgur.com/4bJ8mb9.png)
+   - follow the steps to get your Spotify App and get the client ID and secret key\
+     ![spotify keys](https://i.imgur.com/w2EzFtB.png)
+   - paste the codes in the form\
+     ![api keys](https://i.imgur.com/6b9xauo.png)
+   - copy the _Redirect URL_ presented on the form\
+     ![redirect url](https://i.imgur.com/GMzl0lG.png)
+   - on Spotify click the "EDIT SETTINGS" button and paste the copied link in the _Redirect URI's_ prompt
+     ![spotify app setting](https://i.imgur.com/vb0x4Tl.png)
+   - back on LNBits, click "AUTORIZE ACCESS" and "Agree" on the page that will open
+   - choose on which device the LNBits Jukebox extensions will stream to, you may have to be logged in in order to select the device (browser, smartphone app, etc...)
+   - and select what playlist will be available for users to choose songs (you need to have already playlist on Spotify)\
+     ![select playlists](https://i.imgur.com/g4dbtED.png)
+
+3. After Jukebox is created, click the icon to open the dialog with the shareable QR, open the Jukebox page, etc...\
+   ![shareable jukebox](https://i.imgur.com/EAh9PI0.png)
+4. The users will see the Jukebox page and choose a song from the selected playlist\
+   ![select song](https://i.imgur.com/YYjeQAs.png)
+5. After selecting a song they'd like to hear next a dialog will show presenting the music\
+   ![play for sats](https://i.imgur.com/eEHl3o8.png)
+6. After payment, the song will automatically start playing on the device selected or enter the queue if some other music is already playing

lnbits/extensions/jukebox/__init__.py

@@ -10,3 +10,8 @@ jukebox_ext: Blueprint = Blueprint(
 
 from .views_api import *  # noqa
 from .views import *  # noqa
+from .tasks import register_listeners
+
+from lnbits.tasks import record_async
+
+jukebox_ext.record(record_async(register_listeners))

lnbits/extensions/jukebox/crud.py

@@ -21,7 +21,7 @@ async def create_jukebox(
     juke_id = urlsafe_short_hash()
     result = await db.execute(
         """
-        INSERT INTO jukebox (id, user, title, wallet, sp_user, sp_secret, sp_access_token, sp_refresh_token, sp_device, sp_playlists, price, profit)
+        INSERT INTO jukebox.jukebox (id, user, title, wallet, sp_user, sp_secret, sp_access_token, sp_refresh_token, sp_device, sp_playlists, price, profit)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
@@ -47,35 +47,35 @@ async def create_jukebox(
 async def update_jukebox(juke_id: str, **kwargs) -> Optional[Jukebox]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE jukebox SET {q} WHERE id = ?", (*kwargs.values(), juke_id)
+        f"UPDATE jukebox.jukebox SET {q} WHERE id = ?", (*kwargs.values(), juke_id)
     )
-    row = await db.fetchone("SELECT * FROM jukebox WHERE id = ?", (juke_id,))
+    row = await db.fetchone("SELECT * FROM jukebox.jukebox WHERE id = ?", (juke_id,))
     return Jukebox(**row) if row else None
 
 
 async def get_jukebox(juke_id: str) -> Optional[Jukebox]:
-    row = await db.fetchone("SELECT * FROM jukebox WHERE id = ?", (juke_id,))
+    row = await db.fetchone("SELECT * FROM jukebox.jukebox WHERE id = ?", (juke_id,))
     return Jukebox(**row) if row else None
 
 
 async def get_jukebox_by_user(user: str) -> Optional[Jukebox]:
-    row = await db.fetchone("SELECT * FROM jukebox WHERE sp_user = ?", (user,))
+    row = await db.fetchone("SELECT * FROM jukebox.jukebox WHERE sp_user = ?", (user,))
     return Jukebox(**row) if row else None
 
 
 async def get_jukeboxs(user: str) -> List[Jukebox]:
-    rows = await db.fetchall("SELECT * FROM jukebox WHERE user = ?", (user,))
+    rows = await db.fetchall("SELECT * FROM jukebox.jukebox WHERE user = ?", (user,))
     for row in rows:
         if row.sp_playlists == "":
             await delete_jukebox(row.id)
-    rows = await db.fetchall("SELECT * FROM jukebox WHERE user = ?", (user,))
+    rows = await db.fetchall("SELECT * FROM jukebox.jukebox WHERE user = ?", (user,))
     return [Jukebox.from_row(row) for row in rows]
 
 
 async def delete_jukebox(juke_id: str):
     await db.execute(
         """
-        DELETE FROM jukebox WHERE id = ?
+        DELETE FROM jukebox.jukebox WHERE id = ?
         """,
         (juke_id),
     )
@@ -89,7 +89,7 @@ async def create_jukebox_payment(
 ) -> JukeboxPayment:
     result = await db.execute(
         """
-        INSERT INTO jukebox_payment (payment_hash, juke_id, song_id, paid)
+        INSERT INTO jukebox.jukebox_payment (payment_hash, juke_id, song_id, paid)
         VALUES (?, ?, ?, ?)
         """,
         (
@@ -109,7 +109,7 @@ async def update_jukebox_payment(
 ) -> Optional[JukeboxPayment]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE jukebox_payment SET {q} WHERE payment_hash = ?",
+        f"UPDATE jukebox.jukebox_payment SET {q} WHERE payment_hash = ?",
         (*kwargs.values(), payment_hash),
     )
     return await get_jukebox_payment(payment_hash)
@@ -117,6 +117,6 @@ async def update_jukebox_payment(
 
 async def get_jukebox_payment(payment_hash: str) -> Optional[JukeboxPayment]:
     row = await db.fetchone(
-        "SELECT * FROM jukebox_payment WHERE payment_hash = ?", (payment_hash,)
+        "SELECT * FROM jukebox.jukebox_payment WHERE payment_hash = ?", (payment_hash,)
     )
     return JukeboxPayment(**row) if row else None

lnbits/extensions/jukebox/migrations.py

@@ -4,9 +4,9 @@ async def m001_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE jukebox (
+        CREATE TABLE jukebox.jukebox (
             id TEXT PRIMARY KEY,
-            user TEXT,
+            "user" TEXT,
             title TEXT,
             wallet TEXT,
             inkey TEXT,
@@ -29,7 +29,7 @@ async def m002_initial(db):
     """
     await db.execute(
         """
-        CREATE TABLE jukebox_payment (
+        CREATE TABLE jukebox.jukebox_payment (
             payment_hash TEXT PRIMARY KEY,
             juke_id TEXT,
             song_id TEXT,

lnbits/extensions/jukebox/static/js/index.js

@@ -46,12 +46,6 @@ new Vue({
             align: 'left',
             label: 'Price',
             field: 'price'
-          },
-          {
-            name: 'profit',
-            align: 'left',
-            label: 'Profit',
-            field: 'profit'
           }
         ],
         pagination: {
@@ -93,7 +87,11 @@ new Vue({
     getJukeboxes() {
       self = this
       LNbits.api
-        .request('GET', '/jukebox/api/v1/jukebox', self.g.user.wallets[0].adminkey)
+        .request(
+          'GET',
+          '/jukebox/api/v1/jukebox',
+          self.g.user.wallets[0].adminkey
+        )
         .then(function (response) {
           self.JukeboxLinks = response.data.map(mapJukebox)
         })
@@ -165,10 +163,10 @@ new Vue({
           LNbits.utils.notifyApiError(err)
         })
     },
-     authAccess() {
+    authAccess() {
       self = this
-       self.requestAuthorization()
-       self.getSpotifyTokens()
+      self.requestAuthorization()
+      self.getSpotifyTokens()
       self.$q.notify({
         spinner: true,
         message: 'Processing',
@@ -195,37 +193,37 @@ new Vue({
               if (self.jukeboxDialog.data.sp_access_token) {
                 self.refreshPlaylists()
                 self.refreshDevices()
-                console.log("this.devices")
+                console.log('this.devices')
                 console.log(self.devices)
-                console.log("this.devices")
+                console.log('this.devices')
                 setTimeout(function () {
-                if (self.devices.length < 1 || self.playlists.length < 1) {
-                  self.$q.notify({
-                    spinner: true,
-                    color: 'red',
-                    message:
-                      'Error! Make sure Spotify is open on the device you wish to use, has playlists, and is playing something',
-                    timeout: 10000
-                  })
-                  LNbits.api
-                   .request(
-                      'DELETE',
-                      '/jukebox/api/v1/jukebox/' + response.data.id,
-                      self.g.user.wallets[0].adminkey
-                    )
-                    .then(function (response) {
-                      self.getJukeboxes()
+                  if (self.devices.length < 1 || self.playlists.length < 1) {
+                    self.$q.notify({
+                      spinner: true,
+                      color: 'red',
+                      message:
+                        'Error! Make sure Spotify is open on the device you wish to use, has playlists, and is playing something',
+                      timeout: 10000
                     })
-                    .catch(err => {
-                      LNbits.utils.notifyApiError(err)
-                    })
-                  clearInterval(timerId)
-                  self.closeFormDialog()
-                } else {
-                  self.step = 4
-                  clearInterval(timerId)
-                }
-              }, 2000)
+                    LNbits.api
+                      .request(
+                        'DELETE',
+                        '/jukebox/api/v1/jukebox/' + response.data.id,
+                        self.g.user.wallets[0].adminkey
+                      )
+                      .then(function (response) {
+                        self.getJukeboxes()
+                      })
+                      .catch(err => {
+                        LNbits.utils.notifyApiError(err)
+                      })
+                    clearInterval(timerId)
+                    self.closeFormDialog()
+                  } else {
+                    self.step = 4
+                    clearInterval(timerId)
+                  }
+                }, 2000)
               }
             }
           })
@@ -347,15 +345,15 @@ new Vue({
         }
       }
     },
-     refreshDevices() {
+    refreshDevices() {
       self = this
-       self.deviceApi(
+      self.deviceApi(
         'GET',
         'https://api.spotify.com/v1/me/player/devices',
         null
       )
     },
-     fetchAccessToken(code) {
+    fetchAccessToken(code) {
       self = this
       let body = 'grant_type=authorization_code'
       body += '&code=' + code
@@ -363,16 +361,16 @@ new Vue({
         '&redirect_uri=' +
         encodeURI(self.locationcbPath + self.jukeboxDialog.data.sp_id)
 
-       self.callAuthorizationApi(body)
+      self.callAuthorizationApi(body)
     },
-     refreshAccessToken() {
+    refreshAccessToken() {
       self = this
       let body = 'grant_type=refresh_token'
       body += '&refresh_token=' + self.jukeboxDialog.data.sp_refresh_token
       body += '&client_id=' + self.jukeboxDialog.data.sp_user
-       self.callAuthorizationApi(body)
+      self.callAuthorizationApi(body)
     },
-     callAuthorizationApi(body) {
+    callAuthorizationApi(body) {
       self = this
       console.log(
         btoa(

lnbits/extensions/jukebox/static/js/jukebox.js

@@ -6,14 +6,9 @@ new Vue({
   el: '#vue',
   mixins: [windowMixin],
   data() {
-    return {
-    }
+    return {}
   },
   computed: {},
-  methods: {
-  
-  },
-  created() {
-
-  }
+  methods: {},
+  created() {}
 })

lnbits/extensions/jukebox/tasks.py

@@ -0,0 +1,28 @@
+import json
+import trio  # type: ignore
+
+from lnbits.core.models import Payment
+from lnbits.core.crud import create_payment
+from lnbits.core import db as core_db
+from lnbits.tasks import register_invoice_listener, internal_invoice_paid
+from lnbits.helpers import urlsafe_short_hash
+
+from .crud import get_jukebox, update_jukebox_payment
+
+
+async def register_listeners():
+    invoice_paid_chan_send, invoice_paid_chan_recv = trio.open_memory_channel(2)
+    register_invoice_listener(invoice_paid_chan_send)
+    await wait_for_paid_invoices(invoice_paid_chan_recv)
+
+
+async def wait_for_paid_invoices(invoice_paid_chan: trio.MemoryReceiveChannel):
+    async for payment in invoice_paid_chan:
+        await on_invoice_paid(payment)
+
+
+async def on_invoice_paid(payment: Payment) -> None:
+    if "jukebox" != payment.extra.get("tag"):
+        # not a jukebox invoice
+        return
+    await update_jukebox_payment(payment.payment_hash, paid=True)

lnbits/extensions/jukebox/templates/jukebox/_api_docs.html

@@ -1,24 +1,33 @@
 <q-card-section>
-  To use this extension you need a Spotify client ID and client secret. You
-  get these by creating an app in the Spotify developers dashboard
-  <a style="color:#43a047" href="https://developer.spotify.com/dashboard/applications">here </a>
-  <br /><br />Select the playlists you want people to be able to pay for,
-  share the frontend page, profit :) <br /><br />
-  Made by, <a style="color:#43a047" href="https://twitter.com/arcbtc">benarc</a>. Inspired by,
-  <a style="color:#43a047" href="https://twitter.com/pirosb3/status/1056263089128161280">pirosb3</a>.
+  To use this extension you need a Spotify client ID and client secret. You get
+  these by creating an app in the Spotify developers dashboard
+  <a
+    style="color: #43a047"
+    href="https://developer.spotify.com/dashboard/applications"
+    >here
+  </a>
+  <br /><br />Select the playlists you want people to be able to pay for, share
+  the frontend page, profit :) <br /><br />
+  Made by,
+  <a style="color: #43a047" href="https://twitter.com/arcbtc">benarc</a>.
+  Inspired by,
+  <a
+    style="color: #43a047"
+    href="https://twitter.com/pirosb3/status/1056263089128161280"
+    >pirosb3</a
+  >.
 </q-card-section>
 
-
-
-
-
-
-<q-expansion-item group="extras" icon="swap_vertical_circle" label="API info" :content-inset-level="0.5">
+<q-expansion-item
+  group="extras"
+  icon="swap_vertical_circle"
+  label="API info"
+  :content-inset-level="0.5"
+>
   <q-expansion-item group="api" dense expand-separator label="List jukeboxes">
     <q-card>
       <q-card-section>
-        <code><span class="text-blue">GET</span>
-          /jukebox/api/v1/jukebox</code>
+        <code><span class="text-blue">GET</span> /jukebox/api/v1/jukebox</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
@@ -27,7 +36,8 @@
         </h5>
         <code>[&lt;jukebox_object&gt;, ...]</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X GET {{ request.url_root }}api/v1/jukebox -H "X-Api-Key: {{
+        <code
+          >curl -X GET {{ request.url_root }}api/v1/jukebox -H "X-Api-Key: {{
           g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
@@ -36,8 +46,10 @@
   <q-expansion-item group="api" dense expand-separator label="Get jukebox">
     <q-card>
       <q-card-section>
-        <code><span class="text-blue">GET</span>
-          /jukebox/api/v1/jukebox/&lt;juke_id&gt;</code>
+        <code
+          ><span class="text-blue">GET</span>
+          /jukebox/api/v1/jukebox/&lt;juke_id&gt;</code
+        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
@@ -46,36 +58,44 @@
         </h5>
         <code>&lt;jukebox_object&gt;</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X GET {{ request.url_root }}api/v1/jukebox/&lt;juke_id&gt; -H "X-Api-Key: {{
-          g.user.wallets[0].adminkey }}"
+        <code
+          >curl -X GET {{ request.url_root }}api/v1/jukebox/&lt;juke_id&gt; -H
+          "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
   </q-expansion-item>
-  <q-expansion-item group="api" dense expand-separator label="Create/update track">
+  <q-expansion-item
+    group="api"
+    dense
+    expand-separator
+    label="Create/update track"
+  >
     <q-card>
       <q-card-section>
-        <code><span class="text-green">POST/PUT</span>
-          /jukebox/api/v1/jukebox/</code>
+        <code
+          ><span class="text-green">POST/PUT</span>
+          /jukebox/api/v1/jukebox/</code
+        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Body (application/json)
-        </h5>
+        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 200 OK (application/json)
         </h5>
         <code>&lt;jukbox_object&gt;</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X POST {{ request.url_root }}api/v1/jukebox/ -d
-          '{"user": &lt;string, user_id&gt;,
-          "title": &lt;string&gt;, "wallet":&lt;string&gt;, "sp_user":
-          &lt;string, spotify_user_account&gt;, "sp_secret": &lt;string, spotify_user_secret&gt;, "sp_access_token":
-          &lt;string, not_required&gt;, "sp_refresh_token":
-          &lt;string, not_required&gt;, "sp_device": &lt;string, spotify_user_secret&gt;, "sp_playlists":
-          &lt;string, not_required&gt;, "price":
-          &lt;integer, not_required&gt;}' -H "Content-type:
-          application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+        <code
+          >curl -X POST {{ request.url_root }}api/v1/jukebox/ -d '{"user":
+          &lt;string, user_id&gt;, "title": &lt;string&gt;,
+          "wallet":&lt;string&gt;, "sp_user": &lt;string,
+          spotify_user_account&gt;, "sp_secret": &lt;string,
+          spotify_user_secret&gt;, "sp_access_token": &lt;string,
+          not_required&gt;, "sp_refresh_token": &lt;string, not_required&gt;,
+          "sp_device": &lt;string, spotify_user_secret&gt;, "sp_playlists":
+          &lt;string, not_required&gt;, "price": &lt;integer, not_required&gt;}'
+          -H "Content-type: application/json" -H "X-Api-Key:
+          {{g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
@@ -83,8 +103,10 @@
   <q-expansion-item group="api" dense expand-separator label="Delete jukebox">
     <q-card>
       <q-card-section>
-        <code><span class="text-red">DELETE</span>
-          /jukebox/api/v1/jukebox/&lt;juke_id&gt;</code>
+        <code
+          ><span class="text-red">DELETE</span>
+          /jukebox/api/v1/jukebox/&lt;juke_id&gt;</code
+        >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
@@ -93,9 +115,11 @@
         </h5>
         <code>&lt;jukebox_object&gt;</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code>curl -X DELETE {{ request.url_root }}api/v1/jukebox/&lt;juke_id&gt; -H "X-Api-Key: {{
-          g.user.wallets[0].adminkey }}"
+        <code
+          >curl -X DELETE {{ request.url_root }}api/v1/jukebox/&lt;juke_id&gt;
+          -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
     </q-card>
-  </q-expansion-item>
+  </q-expansion-item></q-expansion-item
+>

lnbits/extensions/jukebox/templates/jukebox/error.html

@@ -12,7 +12,9 @@
             style="font-size: 20rem"
           ></q-icon>
 
-          <h5 class="q-my-none">Ask the host to turn on the device and launch spotify</h5>
+          <h5 class="q-my-none">
+            Ask the host to turn on the device and launch spotify
+          </h5>
           <br />
         </center>
       </q-card-section>

lnbits/extensions/jukebox/templates/jukebox/index.html

@@ -4,18 +4,36 @@
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="green-7" class="q-ma-lg" @click="openNewDialog()">Add Spotify Jukebox</q-btn>
+        <q-btn
+          unelevated
+          color="primary"
+          class="q-ma-lg"
+          @click="openNewDialog()"
+          >Add Spotify Jukebox</q-btn
+        >
 
         {% raw %}
 
-        <q-table flat dense :data="JukeboxLinks" row-key="id" :columns="JukeboxTable.columns"
-          :pagination.sync="JukeboxTable.pagination" :filter="filter">
+        <q-table
+          flat
+          dense
+          :data="JukeboxLinks"
+          row-key="id"
+          :columns="JukeboxTable.columns"
+          :pagination.sync="JukeboxTable.pagination"
+          :filter="filter"
+        >
           <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" auto-width>
+              <q-th
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                auto-width
+              >
                 <div v-if="col.name == 'id'"></div>
                 <div v-else>{{ col.label }}</div>
               </q-th>
@@ -26,18 +44,43 @@
           <template v-slot:body="props">
             <q-tr :props="props">
               <q-td auto-width>
-                <q-btn unelevated dense size="xs" icon="launch" :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  @click="openQrCodeDialog(props.row.sp_id)">
+                <q-btn
+                  unelevated
+                  dense
+                  size="xs"
+                  icon="launch"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  @click="openQrCodeDialog(props.row.sp_id)"
+                >
                   <q-tooltip> Jukebox QR </q-tooltip>
                 </q-btn>
               </q-td>
               <q-td auto-width>
-                <q-btn flat dense size="xs" @click="updateJukebox(props.row.id)" icon="edit" color="light-blue"></q-btn>
-                <q-btn flat dense size="xs" @click="deleteJukebox(props.row.id)" icon="cancel" color="pink">
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="updateJukebox(props.row.id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteJukebox(props.row.id)"
+                  icon="cancel"
+                  color="pink"
+                >
                   <q-tooltip> Delete Jukebox </q-tooltip>
                 </q-btn>
               </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props" auto-width>
+              <q-td
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                auto-width
+              >
                 <div v-if="col.name == 'id'"></div>
                 <div v-else>{{ col.value }}</div>
               </q-td>
@@ -63,23 +106,62 @@
 
   <q-dialog v-model="jukeboxDialog.show" position="top" @hide="closeFormDialog">
     <q-card class="q-pa-md q-pt-lg q-mt-md" style="width: 100%">
-      <q-stepper v-model="step" active-color="green-7" inactive-color="green-10" vertical animated>
-        <q-step :name="1" title="Pick wallet, price" icon="account_balance_wallet" :done="step > 1">
-          <q-input filled class="q-pt-md" dense v-model.trim="jukeboxDialog.data.title" label="Jukebox name"></q-input>
-          <q-select class="q-pb-md q-pt-md" filled dense emit-value v-model="jukeboxDialog.data.wallet"
-            :options="g.user.walletOptions" label="Wallet to use"></q-select>
-          <q-input filled dense v-model.trim="jukeboxDialog.data.price" type="number" max="1440" label="Price per track"
-            class="q-pb-lg">
+      <q-stepper
+        v-model="step"
+        active-color="primary"
+        inactive-color="secondary"
+        vertical
+        animated
+      >
+        <q-step
+          :name="1"
+          title="Pick wallet, price"
+          icon="account_balance_wallet"
+          :done="step > 1"
+        >
+          <q-input
+            filled
+            class="q-pt-md"
+            dense
+            v-model.trim="jukeboxDialog.data.title"
+            label="Jukebox name"
+          ></q-input>
+          <q-select
+            class="q-pb-md q-pt-md"
+            filled
+            dense
+            emit-value
+            v-model="jukeboxDialog.data.wallet"
+            :options="g.user.walletOptions"
+            label="Wallet to use"
+          ></q-select>
+          <q-input
+            filled
+            dense
+            v-model.trim="jukeboxDialog.data.price"
+            type="number"
+            max="1440"
+            label="Price per track"
+            class="q-pb-lg"
+          >
           </q-input>
           <div class="row">
             <div class="col-4">
               <q-btn
                 v-if="jukeboxDialog.data.title != null && jukeboxDialog.data.price != null && jukeboxDialog.data.wallet != null"
-                color="green-7" @click="step = 2">Continue</q-btn>
-              <q-btn v-else color="green-7" disable>Continue</q-btn>
+                color="primary"
+                @click="step = 2"
+                >Continue</q-btn
+              >
+              <q-btn v-else color="primary" disable>Continue</q-btn>
             </div>
             <div class="col-8">
-              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
+              <q-btn
+                color="primary"
+                class="float-right"
+                @click="closeFormDialog"
+                >Cancel</q-btn
+              >
             </div>
           </div>
 
@@ -90,26 +172,57 @@
           <img src="/jukebox/static/spotapi.gif" />
           To use this extension you need a Spotify client ID and client secret.
           You get these by creating an app in the Spotify developers dashboard
-          <a target="_blank" style="color:#43a047" href="https://developer.spotify.com/dashboard/applications">here</a>.
-          <q-input filled class="q-pb-md q-pt-md" dense v-model.trim="jukeboxDialog.data.sp_user" label="Client ID">
+          <a
+            target="_blank"
+            style="color: #43a047"
+            href="https://developer.spotify.com/dashboard/applications"
+            >here</a
+          >.
+          <q-input
+            filled
+            class="q-pb-md q-pt-md"
+            dense
+            v-model.trim="jukeboxDialog.data.sp_user"
+            label="Client ID"
+          >
           </q-input>
 
-          <q-input dense v-model="jukeboxDialog.data.sp_secret" filled :type="isPwd ? 'password' : 'text'"
-            label="Client secret">
+          <q-input
+            dense
+            v-model="jukeboxDialog.data.sp_secret"
+            filled
+            :type="isPwd ? 'password' : 'text'"
+            label="Client secret"
+          >
             <template #append>
-              <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer" @click="isPwd = !isPwd">
+              <q-icon
+                :name="isPwd ? 'visibility_off' : 'visibility'"
+                class="cursor-pointer"
+                @click="isPwd = !isPwd"
+              >
               </q-icon>
             </template>
           </q-input>
 
           <div class="row q-mt-md">
             <div class="col-4">
-              <q-btn v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
-                color="green-7" @click="submitSpotifyKeys">Submit keys</q-btn>
-              <q-btn v-else color="green-7" disable color="green-7">Submit keys</q-btn>
+              <q-btn
+                v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
+                color="primary"
+                @click="submitSpotifyKeys"
+                >Submit keys</q-btn
+              >
+              <q-btn v-else color="primary" disable color="primary"
+                >Submit keys</q-btn
+              >
             </div>
             <div class="col-8">
-              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
+              <q-btn
+                color="primary"
+                class="float-right"
+                @click="closeFormDialog"
+                >Cancel</q-btn
+              >
             </div>
           </div>
 
@@ -120,42 +233,93 @@
           <img src="/jukebox/static/spotapi1.gif" />
           In the app go to edit-settings, set the redirect URI to this link
           <br />
-          <q-btn dense outline unelevated color="green-7" size="xs"
-            @click="copyText(locationcb + jukeboxDialog.data.sp_id, 'Link copied to clipboard!')">{% raw %}{{ locationcb
-            }}{{ jukeboxDialog.data.sp_id }}{% endraw
+          <q-btn
+            dense
+            outline
+            unelevated
+            color="primary"
+            size="xs"
+            @click="copyText(locationcb + jukeboxDialog.data.sp_id, 'Link copied to clipboard!')"
+            >{% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw
             %}<q-tooltip> Click to copy URL </q-tooltip>
           </q-btn>
           <br />
           Settings can be found
-          <a target="_blank" style="color:#43a047" href="https://developer.spotify.com/dashboard/applications">here</a>.
+          <a
+            target="_blank"
+            style="color: #43a047"
+            href="https://developer.spotify.com/dashboard/applications"
+            >here</a
+          >.
 
           <div class="row q-mt-md">
             <div class="col-4">
-              <q-btn v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
-                color="green-7" @click="authAccess">Authorise access</q-btn>
-              <q-btn v-else color="green-7" disable color="green-7">Authorise access</q-btn>
+              <q-btn
+                v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
+                color="primary"
+                @click="authAccess"
+                >Authorise access</q-btn
+              >
+              <q-btn v-else color="primary" disable color="primary"
+                >Authorise access</q-btn
+              >
             </div>
             <div class="col-8">
-              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
+              <q-btn
+                color="primary"
+                class="float-right"
+                @click="closeFormDialog"
+                >Cancel</q-btn
+              >
             </div>
           </div>
 
           <br />
         </q-step>
 
-        <q-step :name="4" title="Select playlists" icon="queue_music" active-color="green-8" :done="step > 4">
-          <q-select class="q-pb-md q-pt-md" filled dense emit-value v-model="jukeboxDialog.data.sp_device"
-            :options="devices" label="Device jukebox will play to"></q-select>
-          <q-select class="q-pb-md" filled dense multiple emit-value v-model="jukeboxDialog.data.sp_playlists"
-            :options="playlists" label="Playlists available to the jukebox"></q-select>
+        <q-step
+          :name="4"
+          title="Select playlists"
+          icon="queue_music"
+          active-color="primary"
+          :done="step > 4"
+        >
+          <q-select
+            class="q-pb-md q-pt-md"
+            filled
+            dense
+            emit-value
+            v-model="jukeboxDialog.data.sp_device"
+            :options="devices"
+            label="Device jukebox will play to"
+          ></q-select>
+          <q-select
+            class="q-pb-md"
+            filled
+            dense
+            multiple
+            emit-value
+            v-model="jukeboxDialog.data.sp_playlists"
+            :options="playlists"
+            label="Playlists available to the jukebox"
+          ></q-select>
           <div class="row q-mt-md">
             <div class="col-5">
-              <q-btn v-if="jukeboxDialog.data.sp_device != null && jukeboxDialog.data.sp_playlists != null"
-                color="green-7" @click="createJukebox">Create Jukebox</q-btn>
-              <q-btn v-else color="green-7" disable>Create Jukebox</q-btn>
+              <q-btn
+                v-if="jukeboxDialog.data.sp_device != null && jukeboxDialog.data.sp_playlists != null"
+                color="primary"
+                @click="createJukebox"
+                >Create Jukebox</q-btn
+              >
+              <q-btn v-else color="primary" disable>Create Jukebox</q-btn>
             </div>
             <div class="col-7">
-              <q-btn color="green-7" class="float-right" @click="closeFormDialog">Cancel</q-btn>
+              <q-btn
+                color="primary"
+                class="float-right"
+                @click="closeFormDialog"
+                >Cancel</q-btn
+              >
             </div>
           </div>
         </q-step>
@@ -169,15 +333,28 @@
         <h5 class="q-my-none">Shareable Jukebox QR</h5>
       </center>
       <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode :value="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id" :options="{width: 800}"
-          class="rounded-borders"></qrcode>
+        <qrcode
+          :value="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id"
+          :options="{width: 800}"
+          class="rounded-borders"
+        ></qrcode>
       </q-responsive>
       <div class="row q-mt-lg q-gutter-sm">
-        <q-btn outline color="grey"
-          @click="copyText(qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id, 'Link copied to clipboard!')">
-          Copy jukebox link</q-btn>
-        <q-btn outline color="grey" type="a" :href="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id"
-          target="_blank">Open jukebox</q-btn>
+        <q-btn
+          outline
+          color="grey"
+          @click="copyText(qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id, 'Link copied to clipboard!')"
+        >
+          Copy jukebox link</q-btn
+        >
+        <q-btn
+          outline
+          color="grey"
+          type="a"
+          :href="qrCodeDialog.data.url + '/jukebox/' + qrCodeDialog.data.id"
+          target="_blank"
+          >Open jukebox</q-btn
+        >
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
       </div>
     </q-card>
@@ -186,4 +363,4 @@
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="https://cdn.jsdelivr.net/npm/pica@6.1.1/dist/pica.min.js"></script>
 <script src="/jukebox/static/js/index.js"></script>
-{% endblock %}
+{% endblock %}

lnbits/extensions/jukebox/templates/jukebox/jukebox.html

@@ -9,7 +9,8 @@
             <img style="width: 100px" :src="currentPlay.image" />
           </div>
           <div class="col-8">
-            <strong style="font-size: 20px">{{ currentPlay.name }}</strong><br />
+            <strong style="font-size: 20px">{{ currentPlay.name }}</strong
+            ><br />
             <strong style="font-size: 15px">{{ currentPlay.artist }}</strong>
           </div>
         </div>
@@ -19,15 +20,30 @@
     <q-card class="q-mt-lg">
       <q-card-section>
         <p style="font-size: 22px">Pick a song</p>
-        <q-select outlined v-model="playlist" :options="playlists" label="playlists" @input="selectPlaylist()">
+        <q-select
+          outlined
+          v-model="playlist"
+          :options="playlists"
+          label="playlists"
+          @input="selectPlaylist()"
+        >
         </q-select>
       </q-card-section>
       <q-card-section class="q-pa-none">
         <q-separator></q-separator>
-        <q-virtual-scroll style="max-height: 300px" :items="currentPlaylist" separator>
+        <q-virtual-scroll
+          style="max-height: 300px"
+          :items="currentPlaylist"
+          separator
+        >
           <template v-slot="{ item, index }">
-            <q-item :key="index" dense clickable v-ripple
-              @click="payForSong(item.id, item.name, item.artist, item.image)">
+            <q-item
+              :key="index"
+              dense
+              clickable
+              v-ripple
+              @click="payForSong(item.id, item.name, item.artist, item.image)"
+            >
               <q-item-section>
                 <q-item-label>
                   {{ item.name }} - ({{ item.artist }})
@@ -55,7 +71,8 @@
       </q-card-section>
       <br />
       <div class="row q-mt-lg q-gutter-sm">
-        <q-btn outline color="grey" @click="getInvoice(receive.id)">Play for {% endraw %}{{ price }}{% raw %} sats
+        <q-btn outline color="grey" @click="getInvoice(receive.id)"
+          >Play for {% endraw %}{{ price }}{% raw %} sats
         </q-btn>
       </div>
     </q-card>
@@ -63,10 +80,16 @@
   <q-dialog v-model="receive.dialogues.second" position="top">
     <q-card class="q-pa-lg lnbits__dialog-card">
       <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode :value="'lightning:' + receive.paymentReq" :options="{width: 800}" class="rounded-borders"></qrcode>
+        <qrcode
+          :value="'lightning:' + receive.paymentReq"
+          :options="{width: 800}"
+          class="rounded-borders"
+        ></qrcode>
       </q-responsive>
       <div class="row q-mt-lg q-gutter-sm">
-        <q-btn outline color="grey" @click="copyText(receive.paymentReq)">Copy invoice</q-btn>
+        <q-btn outline color="grey" @click="copyText(receive.paymentReq)"
+          >Copy invoice</q-btn
+        >
       </div>
     </q-card>
   </q-dialog>
@@ -84,7 +107,7 @@
       return {
         currentPlaylist: [],
         currentlyPlaying: {},
-        cancelListener: () => { },
+        cancelListener: () => {},
         playlists: {},
         playlist: '',
         heavyList: [],
@@ -111,14 +134,6 @@
       }
     },
     methods: {
-      cancelPayment: function () {
-        this.paymentReq = null
-        clearInterval(this.paymentDialog.checker)
-        if (this.paymentDialog.dismissMsg) {
-          this.paymentDialog.dismissMsg()
-        }
-      },
-      closeReceiveDialog() { },
       payForSong(song_id, name, artist, image) {
         self = this
         self.receive.name = name
@@ -127,66 +142,69 @@
         self.receive.id = song_id
         self.receive.dialogues.first = true
       },
+      startPaymentNotifier() {
+        this.cancelListener()
+
+        this.cancelListener = LNbits.events.onInvoicePaid(
+          this.selectedWallet,
+          payment => {
+            this.paid = true
+            this.receive.dialogues.first = false
+            this.receive.dialogues.second = false
+            LNbits.api
+              .request(
+                'GET',
+                '/jukebox/api/v1/jukebox/jb/invoicep/' +
+                  this.receive.id +
+                  '/{{ juke_id }}/' +
+                  this.receive.paymentHash
+              )
+              .then(response1 => {
+                if (response1.data[2] == this.receive.id) {
+                  setTimeout(() => {
+                    this.getCurrent()
+                  }, 500)
+                  this.$q.notify({
+                    color: 'green',
+                    message:
+                      'Success! "' +
+                      this.receive.name +
+                      '" will be played soon',
+                    timeout: 3000
+                  })
+
+                  this.paid = false
+                  response1 = []
+                }
+              })
+              .catch(err => {
+                LNbits.utils.notifyApiError(err)
+                self.paid = false
+                response1 = []
+              })
+          }
+        )
+      },
       getInvoice(song_id) {
         self = this
         LNbits.api
           .request(
             'GET',
             '/jukebox/api/v1/jukebox/jb/invoice/' +
-            '{{ juke_id }}' +
-            '/' +
-            song_id
+              '{{ juke_id }}' +
+              '/' +
+              song_id
           )
           .then(function (response) {
-
             self.receive.paymentReq = response.data[0][1]
             self.receive.paymentHash = response.data[0][0]
             self.receive.dialogues.second = true
 
-            var paymentChecker = setInterval(function () {
-              if (!self.paid) {
-                self.checkInvoice(self.receive.paymentHash, '{{ juke_id }}')
-              }
-              if (self.paid) {
-                clearInterval(paymentChecker)
-                self.paid = true
-                self.receive.dialogues.first = false
-                self.receive.dialogues.second = false
-                self.$q.notify({
-                  message:
-                    'Processing',
-                })
-                LNbits.api
-                  .request(
-                    'GET',
-                    '/jukebox/api/v1/jukebox/jb/invoicep/' + song_id + '/{{ juke_id }}/' + self.receive.paymentHash)
-                  .then(function (response1) {
-
-                    if (response1.data[2] == song_id) {
-                      setTimeout(function () { self.getCurrent() }, 500)
-                      self.$q.notify({
-                        color: 'green',
-                        message:
-                          'Success! "' + self.receive.name + '" will be played soon',
-                        timeout: 3000
-                      })
-
-                      self.paid = false
-                      response1 = []
-                    }
-                  })
-                  .catch(err => {
-
-                    LNbits.utils.notifyApiError(err)
-                    self.paid = false
-                    response1 = []
-                  })
-              }
-            }, 3000)
-
+            self.$q.notify({
+              message: 'Processing'
+            })
           })
           .catch(err => {
-
             self.$q.notify({
               color: 'warning',
               html: true,
@@ -196,39 +214,17 @@
             })
           })
       },
-      checkInvoice(juke_id, paymentHash) {
-
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/jukebox/api/v1/jukebox/jb/checkinvoice/' + juke_id + '/' + paymentHash,
-            'filla'
-          )
-          .then(function (response) {
-
-            self.paid = response.data.paid
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
       getCurrent() {
-
         LNbits.api
-          .request(
-            'GET',
-            '/jukebox/api/v1/jukebox/jb/currently/{{juke_id}}')
+          .request('GET', '/jukebox/api/v1/jukebox/jb/currently/{{juke_id}}')
           .then(function (res) {
             if (res.data.id) {
-
               self.currentlyPlaying = res.data
             }
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
-
       },
       selectPlaylist() {
         self = this
@@ -236,9 +232,9 @@
           .request(
             'GET',
             '/jukebox/api/v1/jukebox/jb/playlist/' +
-            '{{ juke_id }}' +
-            '/' +
-            self.playlist.split(',')[0].split('-')[1]
+              '{{ juke_id }}' +
+              '/' +
+              self.playlist.split(',')[0].split('-')[1]
           )
           .then(function (response) {
             self.currentPlaylist = response.data
@@ -247,20 +243,21 @@
             LNbits.utils.notifyApiError(err)
           })
       },
-      currentSong() { }
+      currentSong() {}
     },
     created() {
       this.getCurrent()
       this.playlists = JSON.parse('{{ playlists | tojson }}')
-
+      this.selectedWallet.inkey = '{{ inkey }}'
+      this.startPaymentNotifier()
       self = this
       LNbits.api
         .request(
           'GET',
           '/jukebox/api/v1/jukebox/jb/playlist/' +
-          '{{ juke_id }}' +
-          '/' +
-          self.playlists[0].split(',')[0].split('-')[1]
+            '{{ juke_id }}' +
+            '/' +
+            self.playlists[0].split(',')[0].split('-')[1]
         )
         .then(function (response) {
           self.currentPlaylist = response.data
@@ -268,9 +265,7 @@
         .catch(err => {
           LNbits.utils.notifyApiError(err)
         })
-
-      // this.startPaymentNotifier()
     }
   })
 </script>
-{% endblock %}
+{% endblock %}

lnbits/extensions/livestream/crud.py

@@ -9,7 +9,7 @@ from .models import Livestream, Track, Producer
 async def create_livestream(*, wallet_id: str) -> int:
     result = await db.execute(
         """
-        INSERT INTO livestreams (wallet)
+        INSERT INTO livestream.livestreams (wallet)
         VALUES (?)
         """,
         (wallet_id,),
@@ -18,14 +18,16 @@ async def create_livestream(*, wallet_id: str) -> int:
 
 
 async def get_livestream(ls_id: int) -> Optional[Livestream]:
-    row = await db.fetchone("SELECT * FROM livestreams WHERE id = ?", (ls_id,))
+    row = await db.fetchone(
+        "SELECT * FROM livestream.livestreams WHERE id = ?", (ls_id,)
+    )
     return Livestream(**dict(row)) if row else None
 
 
 async def get_livestream_by_track(track_id: int) -> Optional[Livestream]:
     row = await db.fetchone(
         """
-        SELECT livestreams.* FROM livestreams
+        SELECT livestreams.* FROM livestream.livestreams
         INNER JOIN tracks ON tracks.livestream = livestreams.id
         WHERE tracks.id = ?
         """,
@@ -35,7 +37,9 @@ async def get_livestream_by_track(track_id: int) -> Optional[Livestream]:
 
 
 async def get_or_create_livestream_by_wallet(wallet: str) -> Optional[Livestream]:
-    row = await db.fetchone("SELECT * FROM livestreams WHERE wallet = ?", (wallet,))
+    row = await db.fetchone(
+        "SELECT * FROM livestream.livestreams WHERE wallet = ?", (wallet,)
+    )
 
     if not row:
         # create on the fly
@@ -47,14 +51,14 @@ async def get_or_create_livestream_by_wallet(wallet: str) -> Optional[Livestream
 
 async def update_current_track(ls_id: int, track_id: Optional[int]):
     await db.execute(
-        "UPDATE livestreams SET current_track = ? WHERE id = ?",
+        "UPDATE livestream.livestreams SET current_track = ? WHERE id = ?",
         (track_id, ls_id),
     )
 
 
 async def update_livestream_fee(ls_id: int, fee_pct: int):
     await db.execute(
-        "UPDATE livestreams SET fee_pct = ? WHERE id = ?",
+        "UPDATE livestream.livestreams SET fee_pct = ? WHERE id = ?",
         (fee_pct, ls_id),
     )
 
@@ -68,7 +72,7 @@ async def add_track(
 ) -> int:
     result = await db.execute(
         """
-        INSERT INTO tracks (livestream, name, download_url, price_msat, producer)
+        INSERT INTO livestream.tracks (livestream, name, download_url, price_msat, producer)
         VALUES (?, ?, ?, ?, ?)
         """,
         (livestream, name, download_url, price_msat, producer),
@@ -86,7 +90,7 @@ async def update_track(
 ) -> int:
     result = await db.execute(
         """
-        UPDATE tracks SET
+        UPDATE livestream.tracks SET
           name = ?,
           download_url = ?,
           price_msat = ?,
@@ -105,7 +109,7 @@ async def get_track(track_id: Optional[int]) -> Optional[Track]:
     row = await db.fetchone(
         """
         SELECT id, download_url, price_msat, name, producer
-        FROM tracks WHERE id = ?
+        FROM livestream.tracks WHERE id = ?
         """,
         (track_id,),
     )
@@ -116,7 +120,7 @@ async def get_tracks(livestream: int) -> List[Track]:
     rows = await db.fetchall(
         """
         SELECT id, download_url, price_msat, name, producer
-        FROM tracks WHERE livestream = ?
+        FROM livestream.tracks WHERE livestream = ?
         """,
         (livestream,),
     )
@@ -126,7 +130,7 @@ async def get_tracks(livestream: int) -> List[Track]:
 async def delete_track_from_livestream(livestream: int, track_id: int):
     await db.execute(
         """
-        DELETE FROM tracks WHERE livestream = ? AND id = ?
+        DELETE FROM livestream.tracks WHERE livestream = ? AND id = ?
         """,
         (livestream, track_id),
     )
@@ -137,7 +141,7 @@ async def add_producer(livestream: int, name: str) -> int:
 
     existing = await db.fetchall(
         """
-        SELECT id FROM producers
+        SELECT id FROM livestream.producers
         WHERE livestream = ? AND lower(name) = ?
         """,
         (livestream, name.lower()),
@@ -150,7 +154,7 @@ async def add_producer(livestream: int, name: str) -> int:
 
     result = await db.execute(
         """
-        INSERT INTO producers (livestream, name, user, wallet)
+        INSERT INTO livestream.producers (livestream, name, "user", wallet)
         VALUES (?, ?, ?, ?)
         """,
         (livestream, name, user.id, wallet.id),
@@ -161,8 +165,8 @@ async def add_producer(livestream: int, name: str) -> int:
 async def get_producer(producer_id: int) -> Optional[Producer]:
     row = await db.fetchone(
         """
-        SELECT id, user, wallet, name
-        FROM producers WHERE id = ?
+        SELECT id, "user", wallet, name
+        FROM livestream.producers WHERE id = ?
         """,
         (producer_id,),
     )
@@ -172,8 +176,8 @@ async def get_producer(producer_id: int) -> Optional[Producer]:
 async def get_producers(livestream: int) -> List[Producer]:
     rows = await db.fetchall(
         """
-        SELECT id, user, wallet, name
-        FROM producers WHERE livestream = ?
+        SELECT id, "user", wallet, name
+        FROM livestream.producers WHERE livestream = ?
         """,
         (livestream,),
     )

lnbits/extensions/livestream/migrations.py

@@ -3,9 +3,9 @@ async def m001_initial(db):
     Initial livestream tables.
     """
     await db.execute(
-        """
-        CREATE TABLE livestreams (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
+        f"""
+        CREATE TABLE livestream.livestreams (
+            id {db.serial_primary_key},
             wallet TEXT NOT NULL,
             fee_pct INTEGER NOT NULL DEFAULT 10,
             current_track INTEGER
@@ -14,11 +14,11 @@ async def m001_initial(db):
     )
 
     await db.execute(
-        """
-        CREATE TABLE producers (
-            livestream INTEGER NOT NULL REFERENCES livestreams (id),
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            user TEXT NOT NULL,
+        f"""
+        CREATE TABLE livestream.producers (
+            livestream INTEGER NOT NULL REFERENCES {db.references_schema}livestreams (id),
+            id {db.serial_primary_key},
+            "user" TEXT NOT NULL,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL
         );
@@ -26,14 +26,14 @@ async def m001_initial(db):
     )
 
     await db.execute(
-        """
-        CREATE TABLE tracks (
-            livestream INTEGER NOT NULL REFERENCES livestreams (id),
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
+        f"""
+        CREATE TABLE livestream.tracks (
+            livestream INTEGER NOT NULL REFERENCES {db.references_schema}livestreams (id),
+            id {db.serial_primary_key},
             download_url TEXT,
             price_msat INTEGER NOT NULL DEFAULT 0,
             name TEXT,
-            producer INTEGER REFERENCES producers (id) NOT NULL
+            producer INTEGER REFERENCES {db.references_schema}producers (id) NOT NULL
         );
         """
     )

lnbits/extensions/livestream/tasks.py

@@ -1,5 +1,5 @@
 import json
-import trio  # type: ignore
+import trio
 
 from lnbits.core.models import Payment
 from lnbits.core.crud import create_payment

lnbits/extensions/livestream/templates/livestream/index.html

@@ -26,7 +26,7 @@
           </div>
           <div class="col">
             {% raw %}
-            <q-btn unelevated color="deep-purple" type="submit">
+            <q-btn unelevated color="primary" type="submit">
               {{ nextCurrentTrack && nextCurrentTrack ===
               livestream.current_track ? 'Stop' : 'Set' }} current track
             </q-btn>
@@ -46,7 +46,7 @@
             ></q-input>
           </div>
           <div class="col">
-            <q-btn unelevated color="deep-purple" type="submit"
+            <q-btn unelevated color="primary" type="submit"
               >Set percent rate</q-btn
             >
           </div>
@@ -61,7 +61,7 @@
             <h5 class="text-subtitle1 q-my-none">Tracks</h5>
           </div>
           <div class="col q-ml-lg">
-            <q-btn unelevated color="deep-purple" @click="openAddTrackDialog"
+            <q-btn unelevated color="primary" @click="openAddTrackDialog"
               >Add new track</q-btn
             >
           </div>
@@ -296,7 +296,7 @@
             <div class="col q-ml-lg">
               <q-btn
                 unelevated
-                color="deep-purple"
+                color="primary"
                 :disable="disabledAddTrackButton()"
                 type="submit"
               >

lnbits/extensions/lndhub/config.json

@@ -1,6 +1,6 @@
 {
     "name": "LndHub",
-    "short_description": "Access lnbits from BlueWallet or Zeus.",
+    "short_description": "Access lnbits from BlueWallet or Zeus",
     "icon": "navigation",
     "contributors": ["fiatjaf"]
 }

lnbits/extensions/lnticket/__init__.py

@@ -10,3 +10,8 @@ lnticket_ext: Blueprint = Blueprint(
 
 from .views_api import *  # noqa
 from .views import *  # noqa
+from .tasks import register_listeners
+
+from lnbits.tasks import record_async
+
+lnticket_ext.record(record_async(register_listeners))

lnbits/extensions/lnticket/crud.py

@@ -18,7 +18,7 @@ async def create_ticket(
 ) -> Tickets:
     await db.execute(
         """
-        INSERT INTO ticket (id, form, email, ltext, name, wallet, sats, paid)
+        INSERT INTO lnticket.ticket (id, form, email, ltext, name, wallet, sats, paid)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (payment_hash, form, email, ltext, name, wallet, sats, False),
@@ -30,11 +30,13 @@ async def create_ticket(
 
 
 async def set_ticket_paid(payment_hash: str) -> Tickets:
-    row = await db.fetchone("SELECT * FROM ticket WHERE id = ?", (payment_hash,))
+    row = await db.fetchone(
+        "SELECT * FROM lnticket.ticket WHERE id = ?", (payment_hash,)
+    )
     if row[7] == False:
         await db.execute(
             """
-            UPDATE ticket
+            UPDATE lnticket.ticket
             SET paid = true
             WHERE id = ?
             """,
@@ -47,7 +49,7 @@ async def set_ticket_paid(payment_hash: str) -> Tickets:
         amount = formdata.amountmade + row[7]
         await db.execute(
             """
-            UPDATE form
+            UPDATE lnticket.form
             SET amountmade = ?
             WHERE id = ?
             """,
@@ -77,7 +79,7 @@ async def set_ticket_paid(payment_hash: str) -> Tickets:
 
 
 async def get_ticket(ticket_id: str) -> Optional[Tickets]:
-    row = await db.fetchone("SELECT * FROM ticket WHERE id = ?", (ticket_id,))
+    row = await db.fetchone("SELECT * FROM lnticket.ticket WHERE id = ?", (ticket_id,))
     return Tickets(**row) if row else None
 
 
@@ -87,14 +89,14 @@ async def get_tickets(wallet_ids: Union[str, List[str]]) -> List[Tickets]:
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM ticket WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM lnticket.ticket WHERE wallet IN ({q})", (*wallet_ids,)
     )
 
     return [Tickets(**row) for row in rows]
 
 
 async def delete_ticket(ticket_id: str) -> None:
-    await db.execute("DELETE FROM ticket WHERE id = ?", (ticket_id,))
+    await db.execute("DELETE FROM lnticket.ticket WHERE id = ?", (ticket_id,))
 
 
 # FORMS
@@ -111,7 +113,7 @@ async def create_form(
     form_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO form (id, wallet, name, webhook, description, costpword, amountmade)
+        INSERT INTO lnticket.form (id, wallet, name, webhook, description, costpword, amountmade)
         VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
         (form_id, wallet, name, webhook, description, costpword, 0),
@@ -124,14 +126,16 @@ async def create_form(
 
 async def update_form(form_id: str, **kwargs) -> Forms:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(f"UPDATE form SET {q} WHERE id = ?", (*kwargs.values(), form_id))
-    row = await db.fetchone("SELECT * FROM form WHERE id = ?", (form_id,))
+    await db.execute(
+        f"UPDATE lnticket.form SET {q} WHERE id = ?", (*kwargs.values(), form_id)
+    )
+    row = await db.fetchone("SELECT * FROM lnticket.form WHERE id = ?", (form_id,))
     assert row, "Newly updated form couldn't be retrieved"
     return Forms(**row)
 
 
 async def get_form(form_id: str) -> Optional[Forms]:
-    row = await db.fetchone("SELECT * FROM form WHERE id = ?", (form_id,))
+    row = await db.fetchone("SELECT * FROM lnticket.form WHERE id = ?", (form_id,))
     return Forms(**row) if row else None
 
 
@@ -141,11 +145,11 @@ async def get_forms(wallet_ids: Union[str, List[str]]) -> List[Forms]:
 
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
-        f"SELECT * FROM form WHERE wallet IN ({q})", (*wallet_ids,)
+        f"SELECT * FROM lnticket.form WHERE wallet IN ({q})", (*wallet_ids,)
     )
 
     return [Forms(**row) for row in rows]
 
 
 async def delete_form(form_id: str) -> None:
-    await db.execute("DELETE FROM form WHERE id = ?", (form_id,))
+    await db.execute("DELETE FROM lnticket.form WHERE id = ?", (form_id,))

lnbits/extensions/lnticket/migrations.py

@@ -2,21 +2,23 @@ async def m001_initial(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS forms (
+        CREATE TABLE lnticket.forms (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
             description TEXT NOT NULL,
             costpword INTEGER NOT NULL,
             amountmade INTEGER NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS tickets (
+        CREATE TABLE lnticket.tickets (
             id TEXT PRIMARY KEY,
             form TEXT NOT NULL,
             email TEXT NOT NULL,
@@ -24,7 +26,9 @@ async def m001_initial(db):
             name TEXT NOT NULL,
             wallet TEXT NOT NULL,
             sats INTEGER NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
@@ -34,7 +38,7 @@ async def m002_changed(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS ticket (
+        CREATE TABLE lnticket.ticket (
             id TEXT PRIMARY KEY,
             form TEXT NOT NULL,
             email TEXT NOT NULL,
@@ -43,12 +47,16 @@ async def m002_changed(db):
             wallet TEXT NOT NULL,
             sats INTEGER NOT NULL,
             paid BOOLEAN NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
 
-    for row in [list(row) for row in await db.fetchall("SELECT * FROM tickets")]:
+    for row in [
+        list(row) for row in await db.fetchall("SELECT * FROM lnticket.tickets")
+    ]:
         usescsv = ""
 
         for i in range(row[5]):
@@ -59,7 +67,7 @@ async def m002_changed(db):
         usescsv = usescsv[1:]
         await db.execute(
             """
-            INSERT INTO ticket (
+            INSERT INTO lnticket.ticket (
                 id,
                 form,
                 email,
@@ -82,14 +90,14 @@ async def m002_changed(db):
                 True,
             ),
         )
-    await db.execute("DROP TABLE tickets")
+    await db.execute("DROP TABLE lnticket.tickets")
 
 
 async def m003_changed(db):
 
     await db.execute(
         """
-        CREATE TABLE IF NOT EXISTS form (
+        CREATE TABLE lnticket.form (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
@@ -97,12 +105,14 @@ async def m003_changed(db):
             description TEXT NOT NULL,
             costpword INTEGER NOT NULL,
             amountmade INTEGER NOT NULL,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )
 
-    for row in [list(row) for row in await db.fetchall("SELECT * FROM forms")]:
+    for row in [list(row) for row in await db.fetchall("SELECT * FROM lnticket.forms")]:
         usescsv = ""
 
         for i in range(row[5]):
@@ -113,7 +123,7 @@ async def m003_changed(db):
         usescsv = usescsv[1:]
         await db.execute(
             """
-            INSERT INTO form (
+            INSERT INTO lnticket.form (
                 id,
                 wallet,
                 name,
@@ -134,4 +144,4 @@ async def m003_changed(db):
                 row[6],
             ),
         )
-    await db.execute("DROP TABLE forms")
+    await db.execute("DROP TABLE lnticket.forms")

lnbits/extensions/lnticket/tasks.py

@@ -0,0 +1,37 @@
+import json
+import trio  # type: ignore
+
+from lnbits.core.models import Payment
+from lnbits.core.crud import create_payment
+from lnbits.core import db as core_db
+from lnbits.tasks import register_invoice_listener, internal_invoice_paid
+from lnbits.helpers import urlsafe_short_hash
+
+from .crud import get_ticket, set_ticket_paid
+
+
+async def register_listeners():
+    invoice_paid_chan_send, invoice_paid_chan_recv = trio.open_memory_channel(2)
+    register_invoice_listener(invoice_paid_chan_send)
+    await wait_for_paid_invoices(invoice_paid_chan_recv)
+
+
+async def wait_for_paid_invoices(invoice_paid_chan: trio.MemoryReceiveChannel):
+    async for payment in invoice_paid_chan:
+        await on_invoice_paid(payment)
+
+
+async def on_invoice_paid(payment: Payment) -> None:
+    if "lnticket" != payment.extra.get("tag"):
+        # not a lnticket invoice
+        return
+
+    ticket = await get_ticket(payment.checking_id)
+    if not ticket:
+        print("this should never happen", payment)
+        return
+
+    await payment.set_pending(False)
+    await set_ticket_paid(payment.payment_hash)
+    _ticket = await get_ticket(payment.checking_id)
+    print("ticket", _ticket)

lnbits/extensions/lnticket/templates/lnticket/display.html

@@ -33,7 +33,7 @@
           <div class="row q-mt-lg">
             <q-btn
               unelevated
-              color="deep-purple"
+              color="primary"
               :disable="formDialog.data.name == '' || formDialog.data.text == ''"
               type="submit"
               >Submit</q-btn
@@ -77,7 +77,7 @@
 
 {% endblock %} {% block scripts %}
 <script>
-  console.log('{{ form_costpword }}')
+  //console.log('{{ form_costpword }}')
   Vue.component(VueQrcode.name, VueQrcode)
 
   new Vue({
@@ -99,7 +99,11 @@
           show: false,
           status: 'pending',
           paymentReq: null
-        }
+        },
+        wallet: {
+          inkey: ''
+        },
+        cancelListener: () => {}
       }
     },
     computed: {
@@ -128,12 +132,35 @@
       },
 
       closeReceiveDialog: function () {
-        var checker = this.receive.paymentChecker
+        var checker = this.startPaymentNotifier
         dismissMsg()
 
-        clearInterval(paymentChecker)
         setTimeout(function () {}, 10000)
       },
+      startPaymentNotifier() {
+        this.cancelListener()
+
+        this.cancelListener = LNbits.events.onInvoicePaid(
+          this.wallet,
+          payment => {
+            this.receive = {
+              show: false,
+              status: 'complete',
+              paymentReq: null
+            }
+            dismissMsg()
+
+            this.formDialog.data.name = ''
+            this.formDialog.data.email = ''
+            this.formDialog.data.text = ''
+            this.$q.notify({
+              type: 'positive',
+              message: 'Sent, thank you!',
+              icon: 'thumb_up'
+            })
+          }
+        )
+      },
       Invoice: function () {
         var self = this
         axios
@@ -158,39 +185,15 @@
               status: 'pending',
               paymentReq: self.paymentReq
             }
-
-            paymentChecker = setInterval(function () {
-              axios
-                .get('/lnticket/api/v1/tickets/' + self.paymentCheck)
-                .then(function (res) {
-                  if (res.data.paid) {
-                    clearInterval(paymentChecker)
-                    self.receive = {
-                      show: false,
-                      status: 'complete',
-                      paymentReq: null
-                    }
-                    dismissMsg()
-
-                    self.formDialog.data.name = ''
-                    self.formDialog.data.email = ''
-                    self.formDialog.data.text = ''
-                    self.$q.notify({
-                      type: 'positive',
-                      message: 'Sent, thank you!',
-                      icon: 'thumb_up'
-                    })
-                  }
-                })
-                .catch(function (error) {
-                  LNbits.utils.notifyApiError(error)
-                })
-            }, 2000)
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       }
+    },
+    created() {
+      this.wallet.inkey = '{{form_wallet}}'
+      this.startPaymentNotifier()
     }
   })
 </script>

lnbits/extensions/lnticket/templates/lnticket/index.html

@@ -4,7 +4,7 @@
   <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="formDialog.show = true"
+        <q-btn unelevated color="primary" @click="formDialog.show = true"
           >New Form</q-btn
         >
       </q-card-section>
@@ -90,6 +90,16 @@
           <div class="col">
             <h5 class="text-subtitle1 q-my-none">Tickets</h5>
           </div>
+          <!-- <div class="col-auto">
+            <q-btn
+              flat
+              color="grey"
+              icon="autorenew"
+              :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+              @click="getTickets"
+              ><q-tooltip> Refresh Tickets </q-tooltip></q-btn
+            >
+          </div> -->
           <div class="col-auto">
             <q-btn flat color="grey" @click="exportticketsCSV"
               >Export to CSV</q-btn
@@ -207,7 +217,7 @@
           <q-btn
             v-if="formDialog.data.id"
             unelevated
-            color="deep-purple"
+            color="primary"
             type="submit"
             >Update Form</q-btn
           >
@@ -215,7 +225,7 @@
           <q-btn
             v-else
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="formDialog.data.costpword == null || formDialog.data.costpword < 0 || formDialog.data.name == null"
             type="submit"
             >Create Form</q-btn
@@ -230,7 +240,7 @@
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script>
-  var mapLNTicket = function(obj) {
+  const mapLNTicket = function (obj) {
     obj.date = Quasar.utils.date.formatDate(
       new Date(obj.time * 1000),
       'YYYY-MM-DD HH:mm'
@@ -243,7 +253,7 @@
   new Vue({
     el: '#vue',
     mixins: [windowMixin],
-    data: function() {
+    data: function () {
       return {
         forms: [],
         tickets: [],
@@ -290,11 +300,12 @@
         formDialog: {
           show: false,
           data: {}
-        }
+        },
+        cancelListener: () => {}
       }
     },
     methods: {
-      getTickets: function() {
+      getTickets: function () {
         var self = this
 
         LNbits.api
@@ -303,40 +314,43 @@
             '/lnticket/api/v1/tickets?all_wallets',
             this.g.user.wallets[0].inkey
           )
-          .then(function(response) {
-            self.tickets = response.data.map(function(obj) {
-              return mapLNTicket(obj)
-            })
+          .then(function (response) {
+            self.tickets = response.data
+              .map(function (obj) {
+                if (!obj?.paid) return
+                return mapLNTicket(obj)
+              })
+              .filter(v => v)
           })
       },
-      deleteTicket: function(ticketId) {
+      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() {
+          .onOk(function () {
             LNbits.api
               .request(
                 'DELETE',
                 '/lnticket/api/v1/tickets/' + ticketId,
                 _.findWhere(self.g.user.wallets, {id: tickets.wallet}).inkey
               )
-              .then(function(response) {
-                self.tickets = _.reject(self.tickets, function(obj) {
+              .then(function (response) {
+                self.tickets = _.reject(self.tickets, function (obj) {
                   return obj.id == ticketId
                 })
               })
-              .catch(function(error) {
+              .catch(function (error) {
                 LNbits.utils.notifyApiError(error)
               })
           })
       },
-      exportticketsCSV: function() {
+      exportticketsCSV: function () {
         LNbits.utils.exportCSV(this.ticketsTable.columns, this.tickets)
       },
 
-      getForms: function() {
+      getForms: function () {
         var self = this
 
         LNbits.api
@@ -345,16 +359,17 @@
             '/lnticket/api/v1/forms?all_wallets',
             this.g.user.wallets[0].inkey
           )
-          .then(function(response) {
-            self.forms = response.data.map(function(obj) {
+          .then(function (response) {
+            self.forms = response.data.map(function (obj) {
               return mapLNTicket(obj)
             })
           })
       },
-      sendFormData: function() {
+      sendFormData: function () {
         var wallet = _.findWhere(this.g.user.wallets, {
           id: this.formDialog.data.wallet
         })
+        this.formDialog.data.inkey = wallet.inkey
         var data = this.formDialog.data
 
         if (data.id) {
@@ -364,22 +379,23 @@
         }
       },
 
-      createForm: function(wallet, data) {
+      createForm: function (wallet, data) {
         var self = this
+        console.log('create', data)
         LNbits.api
           .request('POST', '/lnticket/api/v1/forms', wallet.inkey, data)
-          .then(function(response) {
+          .then(function (response) {
             self.forms.push(mapLNTicket(response.data))
             self.formDialog.show = false
             self.formDialog.data = {}
           })
-          .catch(function(error) {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       },
-      updateformDialog: function(formId) {
+      updateformDialog: function (formId) {
         var link = _.findWhere(this.forms, {id: formId})
-        console.log(link.id)
+
         this.formDialog.data.id = link.id
         this.formDialog.data.wallet = link.wallet
         this.formDialog.data.name = link.name
@@ -387,10 +403,9 @@
         this.formDialog.data.costpword = link.costpword
         this.formDialog.show = true
       },
-      updateForm: function(wallet, data) {
+      updateForm: function (wallet, data) {
         var self = this
-        console.log(data)
-
+        console.log('update', data)
         LNbits.api
           .request(
             'PUT',
@@ -398,50 +413,67 @@
             wallet.inkey,
             data
           )
-          .then(function(response) {
-            self.forms = _.reject(self.forms, function(obj) {
+          .then(function (response) {
+            self.forms = _.reject(self.forms, function (obj) {
               return obj.id == data.id
             })
             self.forms.push(mapLNTicket(response.data))
             self.formDialog.show = false
             self.formDialog.data = {}
           })
-          .catch(function(error) {
+          .catch(function (error) {
             LNbits.utils.notifyApiError(error)
           })
       },
-      deleteForm: function(formsId) {
+      deleteForm: function (formsId) {
         var self = this
         var forms = _.findWhere(this.forms, {id: formsId})
 
         LNbits.utils
           .confirmDialog('Are you sure you want to delete this form link?')
-          .onOk(function() {
+          .onOk(function () {
             LNbits.api
               .request(
                 'DELETE',
                 '/lnticket/api/v1/forms/' + formsId,
                 _.findWhere(self.g.user.wallets, {id: forms.wallet}).inkey
               )
-              .then(function(response) {
-                self.forms = _.reject(self.forms, function(obj) {
+              .then(function (response) {
+                self.forms = _.reject(self.forms, function (obj) {
                   return obj.id == formsId
                 })
               })
-              .catch(function(error) {
+              .catch(function (error) {
                 LNbits.utils.notifyApiError(error)
               })
           })
       },
-      exportformsCSV: function() {
+      exportformsCSV: function () {
         LNbits.utils.exportCSV(this.formsTable.columns, this.forms)
+      },
+      startPaymentNotifier() {
+        this.cancelListener()
+
+        this.cancelListener = LNbits.events.onInvoicePaid(
+          this.g.user.wallets[0],
+          payment => {
+            this.getTickets()
+
+            this.$q.notify({
+              type: 'positive',
+              message: 'New ticket arrived!',
+              icon: 'textsms'
+            })
+          }
+        )
       }
     },
 
-    created: function() {
+    created: function () {
       if (this.g.user.wallets.length) {
         this.getTickets()
         this.getForms()
+        this.startPaymentNotifier()
       }
     }
   })

lnbits/extensions/lnticket/views.py

@@ -1,5 +1,6 @@
 from quart import g, abort, render_template
 
+from lnbits.core.crud import get_wallet
 from lnbits.decorators import check_user_exists, validate_uuids
 from http import HTTPStatus
 
@@ -20,10 +21,13 @@ async def display(form_id):
     if not form:
         abort(HTTPStatus.NOT_FOUND, "LNTicket does not exist.")
 
+    wallet = await get_wallet(form.wallet)
+
     return await render_template(
         "lnticket/display.html",
         form_id=form.id,
         form_name=form.name,
         form_desc=form.description,
         form_costpword=form.costpword,
+        form_wallet=wallet.inkey,
     )

lnbits/extensions/lnurlp/crud.py

@@ -18,7 +18,7 @@ async def create_pay_link(
 ) -> PayLink:
     result = await db.execute(
         """
-        INSERT INTO pay_links (
+        INSERT INTO lnurlp.pay_links (
             wallet,
             description,
             min,
@@ -52,7 +52,7 @@ async def create_pay_link(
 
 
 async def get_pay_link(link_id: int) -> Optional[PayLink]:
-    row = await db.fetchone("SELECT * FROM pay_links WHERE id = ?", (link_id,))
+    row = await db.fetchone("SELECT * FROM lnurlp.pay_links WHERE id = ?", (link_id,))
     return PayLink.from_row(row) if row else None
 
 
@@ -63,7 +63,7 @@ async def get_pay_links(wallet_ids: Union[str, List[str]]) -> List[PayLink]:
     q = ",".join(["?"] * len(wallet_ids))
     rows = await db.fetchall(
         f"""
-        SELECT * FROM pay_links WHERE wallet IN ({q})
+        SELECT * FROM lnurlp.pay_links WHERE wallet IN ({q})
         ORDER BY Id
         """,
         (*wallet_ids,),
@@ -75,20 +75,20 @@ async def get_pay_links(wallet_ids: Union[str, List[str]]) -> List[PayLink]:
 async def update_pay_link(link_id: int, **kwargs) -> Optional[PayLink]:
     q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE pay_links SET {q} WHERE id = ?", (*kwargs.values(), link_id)
+        f"UPDATE lnurlp.pay_links SET {q} WHERE id = ?", (*kwargs.values(), link_id)
     )
-    row = await db.fetchone("SELECT * FROM pay_links WHERE id = ?", (link_id,))
+    row = await db.fetchone("SELECT * FROM lnurlp.pay_links WHERE id = ?", (link_id,))
     return PayLink.from_row(row) if row else None
 
 
 async def increment_pay_link(link_id: int, **kwargs) -> Optional[PayLink]:
     q = ", ".join([f"{field[0]} = {field[0]} + ?" for field in kwargs.items()])
     await db.execute(
-        f"UPDATE pay_links SET {q} WHERE id = ?", (*kwargs.values(), link_id)
+        f"UPDATE lnurlp.pay_links SET {q} WHERE id = ?", (*kwargs.values(), link_id)
     )
-    row = await db.fetchone("SELECT * FROM pay_links WHERE id = ?", (link_id,))
+    row = await db.fetchone("SELECT * FROM lnurlp.pay_links WHERE id = ?", (link_id,))
     return PayLink.from_row(row) if row else None
 
 
 async def delete_pay_link(link_id: int) -> None:
-    await db.execute("DELETE FROM pay_links WHERE id = ?", (link_id,))
+    await db.execute("DELETE FROM lnurlp.pay_links WHERE id = ?", (link_id,))

lnbits/extensions/lnurlp/migrations.py

@@ -3,9 +3,9 @@ async def m001_initial(db):
     Initial pay table.
     """
     await db.execute(
-        """
-        CREATE TABLE IF NOT EXISTS pay_links (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
+        f"""
+        CREATE TABLE lnurlp.pay_links (
+            id {db.serial_primary_key},
             wallet TEXT NOT NULL,
             description TEXT NOT NULL,
             amount INTEGER NOT NULL,
@@ -20,13 +20,13 @@ async def m002_webhooks_and_success_actions(db):
     """
     Webhooks and success actions.
     """
-    await db.execute("ALTER TABLE pay_links ADD COLUMN webhook_url TEXT;")
-    await db.execute("ALTER TABLE pay_links ADD COLUMN success_text TEXT;")
-    await db.execute("ALTER TABLE pay_links ADD COLUMN success_url TEXT;")
+    await db.execute("ALTER TABLE lnurlp.pay_links ADD COLUMN webhook_url TEXT;")
+    await db.execute("ALTER TABLE lnurlp.pay_links ADD COLUMN success_text TEXT;")
+    await db.execute("ALTER TABLE lnurlp.pay_links ADD COLUMN success_url TEXT;")
     await db.execute(
-        """
-        CREATE TABLE invoices (
-            pay_link INTEGER NOT NULL REFERENCES pay_links (id),
+        f"""
+        CREATE TABLE lnurlp.invoices (
+            pay_link INTEGER NOT NULL REFERENCES {db.references_schema}pay_links (id),
             payment_hash TEXT NOT NULL,
             webhook_sent INT, -- null means not sent, otherwise store status
             expiry INT
@@ -41,12 +41,12 @@ async def m003_min_max_comment_fiat(db):
     converted automatically to satoshis based on some API.
     """
     await db.execute(
-        "ALTER TABLE pay_links ADD COLUMN currency TEXT;"
+        "ALTER TABLE lnurlp.pay_links ADD COLUMN currency TEXT;"
     )  # null = satoshis
     await db.execute(
-        "ALTER TABLE pay_links ADD COLUMN comment_chars INTEGER DEFAULT 0;"
+        "ALTER TABLE lnurlp.pay_links ADD COLUMN comment_chars INTEGER DEFAULT 0;"
     )
-    await db.execute("ALTER TABLE pay_links RENAME COLUMN amount TO min;")
-    await db.execute("ALTER TABLE pay_links ADD COLUMN max INTEGER;")
-    await db.execute("UPDATE pay_links SET max = min;")
-    await db.execute("DROP TABLE invoices")
+    await db.execute("ALTER TABLE lnurlp.pay_links RENAME COLUMN amount TO min;")
+    await db.execute("ALTER TABLE lnurlp.pay_links ADD COLUMN max INTEGER;")
+    await db.execute("UPDATE lnurlp.pay_links SET max = min;")
+    await db.execute("DROP TABLE lnurlp.invoices")

lnbits/extensions/lnurlp/tasks.py

@@ -1,4 +1,4 @@
-import trio  # type: ignore
+import trio
 import json
 import httpx
 

lnbits/extensions/lnurlp/templates/lnurlp/_api_docs.html

@@ -7,7 +7,7 @@
   <q-expansion-item group="api" dense expand-separator label="List pay links">
     <q-card>
       <q-card-section>
-        <code><span class="text-blue">GET</span> /api/v1/links</code>
+        <code><span class="text-blue">GET</span> /lnurlp/api/v1/links</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
@@ -27,7 +27,7 @@
     <q-card>
       <q-card-section>
         <code
-          ><span class="text-blue">GET</span> /api/v1/links/&lt;pay_id&gt;</code
+          ><span class="text-blue">GET</span> /lnurlp/api/v1/links/&lt;pay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
@@ -52,11 +52,11 @@
   >
     <q-card>
       <q-card-section>
-        <code><span class="text-green">POST</span> /api/v1/links</code>
+        <code><span class="text-green">POST</span> /lnurlp/api/v1/links</code>
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
         <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code>{"description": &lt;string&gt; "amount": &lt;integer&gt;}</code>
+        <code>{"description": &lt;string&gt; "amount": &lt;integer&gt; "max": &lt;integer&gt; "min": &lt;integer&gt; "comment_chars": &lt;integer&gt;}</code>
         <h5 class="text-caption q-mt-sm q-mb-none">
           Returns 201 CREATED (application/json)
         </h5>
@@ -64,7 +64,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X POST {{ request.url_root }}api/v1/links -d '{"description":
-          &lt;string&gt;, "amount": &lt;integer&gt;}' -H "Content-type:
+          &lt;string&gt;, "amount": &lt;integer&gt;, "max": &lt;integer&gt;, "min": &lt;integer&gt;, "comment_chars": &lt;integer&gt;}' -H "Content-type:
           application/json" -H "X-Api-Key: {{ g.user.wallets[0].adminkey }}"
         </code>
       </q-card-section>
@@ -80,7 +80,7 @@
       <q-card-section>
         <code
           ><span class="text-green">PUT</span>
-          /api/v1/links/&lt;pay_id&gt;</code
+          /lnurlp/api/v1/links/&lt;pay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
@@ -111,7 +111,7 @@
       <q-card-section>
         <code
           ><span class="text-pink">DELETE</span>
-          /api/v1/links/&lt;pay_id&gt;</code
+          /lnurlp/api/v1/links/&lt;pay_id&gt;</code
         >
         <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
         <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />

lnbits/extensions/lnurlp/templates/lnurlp/index.html

@@ -4,7 +4,7 @@
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        <q-btn unelevated color="deep-purple" @click="formDialog.show = true"
+        <q-btn unelevated color="primary" @click="formDialog.show = true"
           >New pay link</q-btn
         >
       </q-card-section>
@@ -227,14 +227,14 @@
           <q-btn
             v-if="formDialog.data.id"
             unelevated
-            color="deep-purple"
+            color="primary"
             type="submit"
             >Update pay link</q-btn
           >
           <q-btn
             v-else
             unelevated
-            color="deep-purple"
+            color="primary"
             :disable="
                 formDialog.data.wallet == null ||
                 formDialog.data.description == null ||

lnbits/extensions/ngrok/README.md

@@ -0,0 +1,20 @@
+<h1>Ngrok</h1>
+<h2>Serve lnbits over https for free using ngrok</h2>
+
+<img src="https://i.ibb.co/QfDD4FS/Screenshot-2021-07-02-7-28-35-AM.png">
+
+<h2>How it works</h2>
+
+When enabled, ngrok creates a tunnel to ngrok.io with https support and tells you the https web address where you can access your lnbits instance. If you are not the first user to enable it, it doesn't create a new one, it just tells you the existing one. Useful for creating/managing/using lnurls, which must be served either via https or via tor. Note that if you restart your device, your device will generate a new url. If anyone is using your old one for wallets, lnurls, etc., whatever they are doing will stop working.
+
+<h2>Installation</h2>
+
+Check the Extensions page on your instance of lnbits. If you have copy of lnbits with ngrok as one of the built in extensions, click Enable -- that's the only thing you need to do to install it.
+
+If your copy of lnbits does not have ngrok as one of the built in extensions, stop lnbits, create go into your lnbits folder, and run this command: ./venv/bin/pip install pyngrok. Then go into the lnbits subdirectory and the extensions subdirectory within that. (So lnbits > lnbits > extensions.) Create a new subdirectory in there called freetunnel, download this repository as a zip file, and unzip it in the freetunnel directory. If your unzipper creates a new "freetunnel" subdirectory, take everything out of there and put it in the freetunnel directory you created. Then go back to the top level lnbits directory and run these commands:
+
+```
+./venv/bin/quart assets
+./venv/bin/quart migrate
+./venv/bin/hypercorn -k trio --bind 0.0.0.0:5000 'lnbits.app:create_app()'
+```

lnbits/extensions/ngrok/__init__.py

@@ -0,0 +1,8 @@
+from quart import Blueprint
+from lnbits.db import Database
+
+db = Database("ext_ngrok")
+
+ngrok_ext: Blueprint = Blueprint("ngrok", __name__, template_folder="templates")
+
+from .views import *  # noqa

lnbits/extensions/ngrok/__pycache__/.gitkeep

@@ -0,0 +1 @@
+

lnbits/extensions/ngrok/config.json

@@ -0,0 +1,6 @@
+{
+    "name": "Ngrok",
+    "short_description": "Serve lnbits over https for free using ngrok",
+    "icon": "trip_origin",
+    "contributors": ["supertestnet"]
+}

lnbits/extensions/ngrok/migrations.py

@@ -0,0 +1,11 @@
+# async def m001_initial(db):
+
+#    await db.execute(
+#        """
+#        CREATE TABLE example.example (
+#            id TEXT PRIMARY KEY,
+#            wallet TEXT NOT NULL,
+#            time TIMESTAMP NOT NULL DEFAULT """ + db.timestamp_now + """
+#        );
+#    """
+#    )

lnbits/extensions/ngrok/templates/ngrok/index.html

@@ -0,0 +1,53 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block page %}
+
+<div class="row q-col-gutter-md">
+  <div class="col-12 col-lg-7 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <h5 class="text-subtitle1 q-mt-none q-mb-md">
+          Access this lnbits instance at the following url
+        </h5>
+        <q-separator class="q-my-lg"></q-separator>
+        <p><a href="{{ ngrok }}" target="_blank">{{ ngrok }}</a></p>
+      </q-card-section>
+    </q-card>
+  </div>
+
+  <div class="col-12 col-md-5 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        <h6 class="text-subtitle1 q-my-none">Ngrok extension</h6>
+      </q-card-section>
+      <q-card-section class="q-pa-none">
+        <q-card>
+          <q-card-section>
+            <p>
+              Note that if you restart your device, your device will generate a
+              new url. If anyone is using your old one for wallets, lnurls,
+              etc., whatever they are doing will stop working.
+            </p>
+            <small
+              >Created by
+              <a href="https://github.com/supertestnet" target="_blank"
+                >Supertestnet</a
+              >.</small
+            >
+          </q-card-section>
+        </q-card>
+      </q-card-section>
+    </q-card>
+  </div>
+</div>
+
+{% endblock %}{% block scripts %} {{ window_vars(user) }}
+<script>
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {}
+    }
+  })
+</script>
+{% endblock %}